From c64d8d1ecbf89bbb94bd7b26ed5e685c2d0944c9 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Mon, 1 Oct 2018 15:19:16 -0700 Subject: [PATCH 01/73] rails new --- .gitignore | 30 ++ .ruby-version | 1 + Gemfile | 80 ++++++ Gemfile.lock | 269 ++++++++++++++++++ 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 +++ .../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 | 26 ++ tmp/.keep | 0 vendor/.keep | 0 79 files changed, 1389 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/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..11a546eaa --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history +/coverage +.DS_Store + + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..53b453642 --- /dev/null +++ b/Gemfile @@ -0,0 +1,80 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-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' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..106512ee2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,269 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + capybara (3.8.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 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..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..39685a85a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module RideShareRails + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0b6186ad8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: ride-share-rails_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..bb30fd2b4 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +zvL4IVBfiZ/4xvaQWt5MRnedy2rYmwuSAW7/1anc0yauhZgOcZmRI0oGYETnOsUIYFtO6jOren5uQgLlUk5XN2jdn4YUiFE0gxtv9POAkDg8xlQWiyjyImxkU0e8TJ+4ePthzUoki2xSq/dllDhsdqAHb8ZejPdm91hCmy89BE2UQXeUCThHuXYyo518iGHZKnSWFpIlTKebuM/6CK9W0VzkkMuTt47Vr6wVONWHjzVF/h4hDhbzfAS4DAuvCjXCP7YeJKwt9q25p8IzHhVYqqivNgAqmB6JkHJUmGpAVkayJ6VjrAH6WvszfRvIoz0tigNb7Y0iepfGQ74nQ5A7uuYSA9lQC5qbJ+AEcPRLspI21MNkPoziSAQuaveRSitcpHjTwT4JeLnzRbM5TmGfXrr+sZrz9FhBADxr--AWJ/I8mcWKH8JIbF--TDVSgkwrUrKhE2M8InMoRw== \ 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/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..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From e4b36b0b9db719c9f71a36214add3ace55d1f583 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Mon, 1 Oct 2018 16:00:25 -0700 Subject: [PATCH 02/73] created routes for driver and passenger --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..1eee72a15 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ Rails.application.routes.draw do + root 'drivers#index' + + resources :driver + resources :passenger # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From f7c4b7f2e3a1cf93a404fe2aeadae12a77b8e79c Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Mon, 1 Oct 2018 16:51:28 -0700 Subject: [PATCH 03/73] created driver model --- app/models/driver.rb | 2 ++ db/migrate/20181001234427_create_drivers.rb | 10 ++++++++++ db/seeds.rb | 10 +++++----- test/fixtures/drivers.yml | 9 +++++++++ test/models/driver_test.rb | 9 +++++++++ 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 app/models/driver.rb create mode 100644 db/migrate/20181001234427_create_drivers.rb create mode 100644 test/fixtures/drivers.yml create mode 100644 test/models/driver_test.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/20181001234427_create_drivers.rb b/db/migrate/20181001234427_create_drivers.rb new file mode 100644 index 000000000..b166e4286 --- /dev/null +++ b/db/migrate/20181001234427_create_drivers.rb @@ -0,0 +1,10 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + + t.timestamps + end + end +end diff --git a/db/seeds.rb b/db/seeds.rb index eab2a92ee..b9286f227 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,7 +6,7 @@ driver_failures = [] CSV.foreach(DRIVER_FILE, :headers => true) do |row| driver = Driver.new - driver.id = row['id'] + driver.id = row['id'].to_i driver.name = row['name'] driver.vin = row['vin'] successful = driver.save @@ -29,7 +29,7 @@ passenger_failures = [] CSV.foreach(PASSENGER_FILE, :headers => true) do |row| passenger = Passenger.new - passenger.id = row['id'] + passenger.id = row['id'].to_i passenger.name = row['name'] passenger.phone_num = row['phone_num'] successful = passenger.save @@ -52,9 +52,9 @@ trip_failures = [] CSV.foreach(TRIP_FILE, :headers => true) do |row| trip = Trip.new - trip.id = row['id'] - trip.driver_id = row['driver_id'] - trip.passenger_id = row['passenger_id'] + trip.id = row['id'].to_i + trip.driver_id = row['driver_id'].to_i + trip.passenger_id = row['passenger_id'].to_i trip.date = Date.strptime(row['date'], '%Y-%m-%d') trip.rating = row['rating'] trip.cost = row['cost'] diff --git a/test/fixtures/drivers.yml b/test/fixtures/drivers.yml new file mode 100644 index 000000000..022996d58 --- /dev/null +++ b/test/fixtures/drivers.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + vin: MyString + +two: + name: MyString + vin: MyString diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb new file mode 100644 index 000000000..203cc4e33 --- /dev/null +++ b/test/models/driver_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Driver do + let(:driver) { Driver.new } + + it "must be valid" do + value(driver).must_be :valid? + end +end From 7094d80a6a7b243c5a3ba26dd632629e8a600154 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Mon, 1 Oct 2018 16:51:39 -0700 Subject: [PATCH 04/73] add passenger and trips migration file --- app/models/passenger.rb | 2 ++ app/models/trip.rb | 4 ++++ db/migrate/20181001234508_create_passengers.rb | 10 ++++++++++ db/migrate/20181001235053_create_trips.rb | 13 +++++++++++++ db/seeds.rb | 12 ++++++------ test/fixtures/passengers.yml | 9 +++++++++ test/fixtures/trips.yml | 15 +++++++++++++++ test/models/passenger_test.rb | 9 +++++++++ test/models/trip_test.rb | 9 +++++++++ 9 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 app/models/passenger.rb create mode 100644 app/models/trip.rb create mode 100644 db/migrate/20181001234508_create_passengers.rb create mode 100644 db/migrate/20181001235053_create_trips.rb create mode 100644 test/fixtures/passengers.yml create mode 100644 test/fixtures/trips.yml create mode 100644 test/models/passenger_test.rb create mode 100644 test/models/trip_test.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/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..8e2566cd8 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,4 @@ +class Trip < ApplicationRecord + belongs_to :driver + belongs_to :passenger +end diff --git a/db/migrate/20181001234508_create_passengers.rb b/db/migrate/20181001234508_create_passengers.rb new file mode 100644 index 000000000..aeced4891 --- /dev/null +++ b/db/migrate/20181001234508_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + t.string :name + t.string :phone_num + + t.timestamps + end + end +end diff --git a/db/migrate/20181001235053_create_trips.rb b/db/migrate/20181001235053_create_trips.rb new file mode 100644 index 000000000..5832577e5 --- /dev/null +++ b/db/migrate/20181001235053_create_trips.rb @@ -0,0 +1,13 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.references :driver, foreign_key: true + t.references :passenger, foreign_key: true + t.Date :date + t.integer :rating + t.integer :cost + + t.timestamps + end + end +end diff --git a/db/seeds.rb b/db/seeds.rb index eab2a92ee..4e82e07bd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,7 +6,7 @@ driver_failures = [] CSV.foreach(DRIVER_FILE, :headers => true) do |row| driver = Driver.new - driver.id = row['id'] + driver.id = row['id'].to_i driver.name = row['name'] driver.vin = row['vin'] successful = driver.save @@ -29,7 +29,7 @@ passenger_failures = [] CSV.foreach(PASSENGER_FILE, :headers => true) do |row| passenger = Passenger.new - passenger.id = row['id'] + passenger.id = row['id'].to_i passenger.name = row['name'] passenger.phone_num = row['phone_num'] successful = passenger.save @@ -52,11 +52,11 @@ trip_failures = [] CSV.foreach(TRIP_FILE, :headers => true) do |row| trip = Trip.new - trip.id = row['id'] - trip.driver_id = row['driver_id'] - trip.passenger_id = row['passenger_id'] + trip.id = row['id'].to_i + trip.driver_id = row['driver_id'].to_i + trip.passenger_id = row['passenger_id'].to_i trip.date = Date.strptime(row['date'], '%Y-%m-%d') - trip.rating = row['rating'] + trip.rating = row['rating'].to_i trip.cost = row['cost'] successful = trip.save if !successful diff --git a/test/fixtures/passengers.yml b/test/fixtures/passengers.yml new file mode 100644 index 000000000..2c97eae02 --- /dev/null +++ b/test/fixtures/passengers.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + phone_num: MyString + +two: + name: MyString + phone_num: MyString diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 000000000..2c310b169 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + driver: one + passenger: one + date: + rating: 1 + cost: 1 + +two: + driver: two + passenger: two + date: + rating: 1 + cost: 1 diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb new file mode 100644 index 000000000..3f55ffd00 --- /dev/null +++ b/test/models/passenger_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Passenger do + let(:passenger) { Passenger.new } + + it "must be valid" do + value(passenger).must_be :valid? + end +end diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb new file mode 100644 index 000000000..6bbc51182 --- /dev/null +++ b/test/models/trip_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Trip do + let(:trip) { Trip.new } + + it "must be valid" do + value(trip).must_be :valid? + end +end From d9cae7a79822791bc8b4fe1f32c7e569ee521dae Mon Sep 17 00:00:00 2001 From: jfahmy Date: Mon, 1 Oct 2018 17:00:02 -0700 Subject: [PATCH 05/73] add model relationships --- app/models/driver.rb | 1 + app/models/passenger.rb | 1 + db/seeds.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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/db/seeds.rb b/db/seeds.rb index 4e82e07bd..5211f3023 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -57,7 +57,7 @@ trip.passenger_id = row['passenger_id'].to_i trip.date = Date.strptime(row['date'], '%Y-%m-%d') trip.rating = row['rating'].to_i - trip.cost = row['cost'] + trip.cost = row['cost'].to_i successful = trip.save if !successful trip_failures << trip From f057a29c08bd78c753979ef19c14425dc6dc3521 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 10:00:39 -0700 Subject: [PATCH 06/73] changed ids to to_i --- db/migrate/20181001235053_create_trips.rb | 2 +- db/schema.rb | 46 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 db/schema.rb diff --git a/db/migrate/20181001235053_create_trips.rb b/db/migrate/20181001235053_create_trips.rb index 5832577e5..6578d5fcd 100644 --- a/db/migrate/20181001235053_create_trips.rb +++ b/db/migrate/20181001235053_create_trips.rb @@ -3,7 +3,7 @@ def change create_table :trips do |t| t.references :driver, foreign_key: true t.references :passenger, foreign_key: true - t.Date :date + t.date :date t.integer :rating t.integer :cost diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a0cf17537 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_01_235053) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "drivers", force: :cascade do |t| + t.string "name" + t.string "vin" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phone_num" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.bigint "driver_id" + t.bigint "passenger_id" + t.date "date" + t.integer "rating" + t.integer "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + 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 68983a52b37f3d2c0fc5dff28b87b173c93cd284 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 10:01:49 -0700 Subject: [PATCH 07/73] create trips migration --- db/migrate/20181001235053_create_trips.rb | 2 +- db/schema.rb | 46 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 db/schema.rb diff --git a/db/migrate/20181001235053_create_trips.rb b/db/migrate/20181001235053_create_trips.rb index 5832577e5..6578d5fcd 100644 --- a/db/migrate/20181001235053_create_trips.rb +++ b/db/migrate/20181001235053_create_trips.rb @@ -3,7 +3,7 @@ def change create_table :trips do |t| t.references :driver, foreign_key: true t.references :passenger, foreign_key: true - t.Date :date + t.date :date t.integer :rating t.integer :cost diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a0cf17537 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_01_235053) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "drivers", force: :cascade do |t| + t.string "name" + t.string "vin" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phone_num" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.bigint "driver_id" + t.bigint "passenger_id" + t.date "date" + t.integer "rating" + t.integer "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + 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 38cc07b417f12537cef37d6c11cdcb2ba5195c33 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 10:16:16 -0700 Subject: [PATCH 08/73] generate drivers controller and views --- app/assets/javascripts/drivers.js | 2 ++ app/assets/stylesheets/drivers.scss | 3 +++ app/controllers/drivers_controller.rb | 30 +++++++++++++++++++++ app/helpers/drivers_helper.rb | 2 ++ app/views/drivers/edit.html.erb | 2 ++ app/views/drivers/index.html.erb | 2 ++ app/views/drivers/new.html.erb | 0 app/views/drivers/show.html.erb | 2 ++ config/routes.rb | 3 +++ test/controllers/drivers_controller_test.rb | 19 +++++++++++++ 10 files changed, 65 insertions(+) create mode 100644 app/assets/javascripts/drivers.js create mode 100644 app/assets/stylesheets/drivers.scss create mode 100644 app/controllers/drivers_controller.rb create mode 100644 app/helpers/drivers_helper.rb create mode 100644 app/views/drivers/edit.html.erb create mode 100644 app/views/drivers/index.html.erb create mode 100644 app/views/drivers/new.html.erb create mode 100644 app/views/drivers/show.html.erb create mode 100644 test/controllers/drivers_controller_test.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/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/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..3deff2775 --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,30 @@ +class DriversController < ApplicationController + + def index + end + + def show + end + + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end + + + private + + def driver_params + return params.require(:driver).permit(:name, :vin) + 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/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..8e7dbd55b --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1,2 @@ +

Drivers#edit

+

Find me in app/views/drivers/edit.html.erb

diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..5a278b7f7 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,2 @@ +

Drivers#index

+

Find me in app/views/drivers/index.html.erb

diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..3501cb73c --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,2 @@ +

Drivers#show

+

Find me in app/views/drivers/show.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 1eee72a15..dbe8fbf11 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + get 'drivers/index' + get 'drivers/show' + get 'drivers/edit' root 'drivers#index' resources :driver diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb new file mode 100644 index 000000000..32b4be265 --- /dev/null +++ b/test/controllers/drivers_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe DriversController do + it "should get index" do + get drivers_index_url + value(response).must_be :success? + end + + it "should get show" do + get drivers_show_url + value(response).must_be :success? + end + + it "should get edit" do + get drivers_edit_url + value(response).must_be :success? + end + +end From 1deb7863db4bda51384508da747bf6c2a01fb87f Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 10:31:56 -0700 Subject: [PATCH 09/73] basic setup of drivers controller, fixed routing --- app/controllers/drivers_controller.rb | 24 +++++++++++++++++++++++- config/routes.rb | 4 ++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 3deff2775..ea23332cd 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -1,30 +1,52 @@ class DriversController < ApplicationController + before_action :set_driver, only: [:show, :edit, :update, :destroy] def index + @drivers = Driver.all end def show end def new + @driver = Driver.new end def create + @driver = Driver.new(driver_params) + if @driver.save + redirect_to root_path + else + render :new + end end def edit end def update + if @driver.update(driver_params) + redirect_to root_path + else + render :edit + end end def destroy + if Task.destroy(params[:id].to_i) + redirect_to root_path + end end - + private def driver_params return params.require(:driver).permit(:name, :vin) end + + def set_driver + @driver = Driver.find(params[:id]) + end + end diff --git a/config/routes.rb b/config/routes.rb index dbe8fbf11..323a45404 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ get 'drivers/edit' root 'drivers#index' - resources :driver - resources :passenger + resources :drivers + resources :passengers # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From d4723358f9ae5bae7d5f170fcccb3a28e3087d26 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 11:17:31 -0700 Subject: [PATCH 10/73] drivers index shows a list of drivers --- app/controllers/drivers_controller.rb | 3 ++- app/models/driver.rb | 3 +++ app/views/drivers/_form.html.erb | 15 +++++++++++++++ app/views/drivers/edit.html.erb | 3 +-- app/views/drivers/index.html.erb | 13 +++++++++++-- app/views/drivers/new.html.erb | 11 +++++++++++ 6 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 app/views/drivers/_form.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index ea23332cd..2877a4eed 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -17,6 +17,7 @@ def create if @driver.save redirect_to root_path else + raise render :new end end @@ -33,7 +34,7 @@ def update end def destroy - if Task.destroy(params[:id].to_i) + if Driver.destroy(params[:id]) redirect_to root_path end end diff --git a/app/models/driver.rb b/app/models/driver.rb index 197e65507..e838051a2 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,6 @@ class Driver < ApplicationRecord + validates :name, presence: true + validates :vin, presence: true, uniqueness: true + has_many :trips end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..1852daf26 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,15 @@ +<%= form_with model: @driver, class: 'form' do |f|%> + +

<%= form_intro %>

+ +
+<%= f.label :name %> +<%= f.text_field :name %> + +<%= f.label :vin %> +<%= f.text_field :vin %> + +<%= f.submit "Save Changes", class: "submit_button" %> +
+ +<%end%> diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb index 8e7dbd55b..e03936583 100644 --- a/app/views/drivers/edit.html.erb +++ b/app/views/drivers/edit.html.erb @@ -1,2 +1 @@ -

Drivers#edit

-

Find me in app/views/drivers/edit.html.erb

+<%= render partial: 'form', locals: {form_intro: 'Please make your changes here:'} %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 5a278b7f7..cd4df76e2 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,2 +1,11 @@ -

Drivers#index

-

Find me in app/views/drivers/index.html.erb

+

Drivers

+ +
    + <% @drivers.each do |driver| %> +
  1. + <%= link_to "#{driver.name}", driver_path(driver.id) %> + <%= link_to "Edit", edit_driver_path(driver.id) %> + <%= link_to "Delete", driver_path(driver.id), method: :delete, data: {confirm: "Delete #{driver.name}?"} %> +
    2. + <% end %> +
diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index e69de29bb..4a6a6e9a2 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -0,0 +1,11 @@ +<% if @driver.errors.any? %> +
    + <% @driver.errors.each do |column, message| %> +
  • + <%= column.capitalize %><%= message %> +
    • + <% end %> +
+<%end%> + +<%= render partial: 'form', locals: {form_intro: 'Please provide the following information to add a new driver:'} %> From 3556cd42c71f8e417e31e63b27ca190e0458d4ce Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 11:29:49 -0700 Subject: [PATCH 11/73] basic driver show view --- app/controllers/drivers_controller.rb | 2 +- app/views/drivers/index.html.erb | 2 +- app/views/drivers/show.html.erb | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 2877a4eed..603e812c2 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -34,7 +34,7 @@ def update end def destroy - if Driver.destroy(params[:id]) + if @driver.destroy redirect_to root_path end end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index cd4df76e2..cc0197a01 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -3,7 +3,7 @@
    <% @drivers.each do |driver| %>
  1. - <%= link_to "#{driver.name}", driver_path(driver.id) %> + <%= link_to "#{driver.name}", driver_path(driver.id) %> <%= link_to "Edit", edit_driver_path(driver.id) %> <%= link_to "Delete", driver_path(driver.id), method: :delete, data: {confirm: "Delete #{driver.name}?"} %>
    2. diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 3501cb73c..dd9ec8aa4 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,2 +1,10 @@ -

    Drivers#show

    -

    Find me in app/views/drivers/show.html.erb

    +

    <%= @driver.name %>

    + +<%= link_to "Edit", edit_driver_path(@driver.id) %> +<%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}?"} %> + +
      + <% @driver.trips.each do |trip| %> +
    1. <%= trip.id %>
      2. + <% end %> +
    From 9c07c571a61d6c1856dbf80131ca53d9f4ed3f2c Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 11:36:55 -0700 Subject: [PATCH 12/73] basic routes, controllers and views in place for index, show, new, edit, destroy --- app/assets/javascripts/passengers.js | 2 + app/assets/stylesheets/passengers.scss | 3 ++ app/controllers/passengers_controller.rb | 47 +++++++++++++++++++ app/helpers/passengers_helper.rb | 2 + app/views/passengers/_form.html.erb | 9 ++++ app/views/passengers/destroy.html.erb | 2 + app/views/passengers/edit.html.erb | 3 ++ app/views/passengers/index.html.erb | 10 ++++ app/views/passengers/new.html.erb | 3 ++ app/views/passengers/show.html.erb | 10 ++++ config/routes.rb | 4 +- .../controllers/passengers_controller_test.rb | 39 +++++++++++++++ 12 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/passengers.js create mode 100644 app/assets/stylesheets/passengers.scss create mode 100644 app/controllers/passengers_controller.rb create mode 100644 app/helpers/passengers_helper.rb create mode 100644 app/views/passengers/_form.html.erb create mode 100644 app/views/passengers/destroy.html.erb create mode 100644 app/views/passengers/edit.html.erb create mode 100644 app/views/passengers/index.html.erb create mode 100644 app/views/passengers/new.html.erb create mode 100644 app/views/passengers/show.html.erb create mode 100644 test/controllers/passengers_controller_test.rb 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/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/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb new file mode 100644 index 000000000..e4e58d6d2 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,47 @@ +class PassengersController < ApplicationController + before_action :set_passenger, only: [:show, :edit, :update, :destroy] + + def index + @passengers = Passenger.all + end + + def show + end + + def new + @passenger = Passenger.new + end + + def create + @passenger = Passenger.new(passenger_params) + if @passenger.save + redirect_to passengers_path + else + render :new + end + end + + def edit + end + + def update + @passenger.update(passenger_params) + redirect_to passenger_path(@passenger.id) + end + + def destroy + @passenger.destroy + redirect_to passenger_path + end + + private + + def passenger_params + return params.require(:passenger).permit(:name, :phone_num) + end + + def set_passenger + @passenger = Passenger.find(params[:id]) + end + +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/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..a2403db45 --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,9 @@ +<%= form_with model: @passenger do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :phone_num %> + <%= f.text_field :phone_num %> + + <%= f.submit action_name, class: "form-button" %> +<% end %> diff --git a/app/views/passengers/destroy.html.erb b/app/views/passengers/destroy.html.erb new file mode 100644 index 000000000..bf98b9174 --- /dev/null +++ b/app/views/passengers/destroy.html.erb @@ -0,0 +1,2 @@ +

    Passengers#destroy

    +

    Find me in app/views/passengers/destroy.html.erb

    diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..3e59d5b6d --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1,3 @@ +

    Passengers#edit

    +
    +<%= render partial: "form", locals: { action_name: "Edit Passenger" } %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..b06d68402 --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,10 @@ +

    All Passengers:

    +
      +<% @passengers.each do |passenger| %> +
    • + <%= link_to "#{passenger.name}", passenger_path(passenger.id) %> + <%= link_to "Edit", edit_passenger_path(passenger.id) %> + <%= link_to "Delete", passenger_path(passenger.id), method: :delete %> +
      • +<% end %> +
    diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..4c3ad2551 --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1,3 @@ +

    Passengers#new

    +
    +<%= render partial: "form", locals: { action_name: "Add Passenger" } %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..ae383abcf --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,10 @@ +

    Viewing Passenger <%= @passenger.id %>

    +

    Name: <%= @passenger.name %>

    +

    Phone Number: <%= @passenger.phone_num %>

    +
      + <% @passenger.trips.each do |trip| %> +
    1. + <%= trip.cost %> +
      2. + <% end %> +
    diff --git a/config/routes.rb b/config/routes.rb index 1eee72a15..81f39540f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do root 'drivers#index' - resources :driver - resources :passenger + resources :drivers + resources :passengers # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb new file mode 100644 index 000000000..f19070ce7 --- /dev/null +++ b/test/controllers/passengers_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe PassengersController do + it "should get index" do + get passengers_index_url + value(response).must_be :success? + end + + it "should get show" do + get passengers_show_url + value(response).must_be :success? + end + + it "should get new" do + get passengers_new_url + value(response).must_be :success? + end + + it "should get create" do + get passengers_create_url + value(response).must_be :success? + end + + it "should get edit" do + get passengers_edit_url + value(response).must_be :success? + end + + it "should get update" do + get passengers_update_url + value(response).must_be :success? + end + + it "should get destroy" do + get passengers_destroy_url + value(response).must_be :success? + end + +end From aa5b70cd8350396ea7873aa9939539e8e19ef053 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 11:41:19 -0700 Subject: [PATCH 13/73] driver model calculates total earnings and average rating --- app/models/driver.rb | 18 ++++++++++++++++++ app/views/drivers/show.html.erb | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index e838051a2..6dd6b2459 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -3,4 +3,22 @@ class Driver < ApplicationRecord validates :vin, presence: true, uniqueness: true has_many :trips + + def total_earnings + total = 0 + self.trips.each do |trip| + total += trip.cost + end + return total + end + + def average_rating + sum = 0 + self.trips.each do |trip| + sum += trip.rating + end + return (sum.to_f / self.trips.length).round(1) + end + + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index dd9ec8aa4..890e2d25a 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -2,7 +2,8 @@ <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}?"} %> - +

    Total Earnings: $<%= @driver.total_earnings.to_f / 100 %>

    +

    Average Rating: <%= @driver.average_rating %>

      <% @driver.trips.each do |trip| %>
    1. <%= trip.id %>
      2. From e00702a08f64b6104deeb2f95c16aaab8c5e4b5f Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 11:57:06 -0700 Subject: [PATCH 14/73] when a driver is deleted the associated trip gets a nil driver --- app/models/driver.rb | 2 +- app/views/drivers/show.html.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 6dd6b2459..af5cf405b 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -2,7 +2,7 @@ class Driver < ApplicationRecord validates :name, presence: true validates :vin, presence: true, uniqueness: true - has_many :trips + has_many :trips, dependent: :nullify def total_earnings total = 0 diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 890e2d25a..06a6ec991 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -4,6 +4,7 @@ <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}?"} %>

      Total Earnings: $<%= @driver.total_earnings.to_f / 100 %>

      Average Rating: <%= @driver.average_rating %>

      +

      Trips Driven:

        <% @driver.trips.each do |trip| %>
      1. <%= trip.id %>
        2. From 0ffacbbd2af67302ac808eee43f9bdaa434b8971 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 11:58:30 -0700 Subject: [PATCH 15/73] Add total_charges method to passenger model and removed foreign key constraint for deleted passengers --- app/models/passenger.rb | 12 +++++++++++- app/views/passengers/show.html.erb | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2fef89192..4e1d6ddbd 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,13 @@ class Passenger < ApplicationRecord - has_many :trips + + has_many :trips, dependent: :nullify + + def total_charges + sum = 0 + self.trips.each do |trip| + sum += trip.cost + end + sum + end + end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index ae383abcf..c3aa0fe3c 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -8,3 +8,4 @@ <% end %>
      +

      Total Charges: <%= "$#{@passenger.total_charges.to_f/100}"%>

      From e74f5b7c6cade77ec09728d4b5a1b4a6f75547cb Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 14:19:41 -0700 Subject: [PATCH 16/73] added table of trip details to driver show view --- app/views/drivers/show.html.erb | 23 +++++++++++++++++++---- config/routes.rb | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 06a6ec991..549308c23 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -4,9 +4,24 @@ <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}?"} %>

      Total Earnings: $<%= @driver.total_earnings.to_f / 100 %>

      Average Rating: <%= @driver.average_rating %>

      -

      Trips Driven:

      -
        +

        Trips for <%= @driver.name %>:

        + + + + + + + + + + <% @driver.trips.each do |trip| %> -
      1. <%= trip.id %>
        2. + + + + + + + + <% end %> - diff --git a/config/routes.rb b/config/routes.rb index 323a45404..72c4e7260 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,5 +6,6 @@ resources :drivers resources :passengers + resources :trips # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 9522605178faf9c5475ea2e009a75a6bf0200065 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 14:59:00 -0700 Subject: [PATCH 17/73] driver forms show validation errors if no data is entered --- app/controllers/drivers_controller.rb | 1 - app/models/driver.rb | 3 +-- app/views/drivers/_form.html.erb | 11 +++++++++++ app/views/drivers/new.html.erb | 10 ---------- config/initializers/action_view.rb | 1 + 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 config/initializers/action_view.rb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 603e812c2..096414d35 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -17,7 +17,6 @@ def create if @driver.save redirect_to root_path else - raise render :new end end diff --git a/app/models/driver.rb b/app/models/driver.rb index af5cf405b..d5c02cb4a 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,6 +1,5 @@ class Driver < ApplicationRecord - validates :name, presence: true - validates :vin, presence: true, uniqueness: true + validates_presence_of :name, :vin has_many :trips, dependent: :nullify diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index 1852daf26..f63f7e919 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -1,3 +1,14 @@ +<% if @driver.errors.any? %> +
          + <% @driver.errors.each do |column, message| %> +
        • + <%= column.capitalize %> <%= message %> +
          • + <% end %> +
        +<% end %> + + <%= form_with model: @driver, class: 'form' do |f|%>

        <%= form_intro %>

        diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 4a6a6e9a2..f734508e2 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1,11 +1 @@ -<% if @driver.errors.any? %> -
          - <% @driver.errors.each do |column, message| %> -
        • - <%= column.capitalize %><%= message %> -
          • - <% end %> -
        -<%end%> - <%= render partial: 'form', locals: {form_intro: 'Please provide the following information to add a new driver:'} %> 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 From 664dc80ed43b3a4fec0248eb20422c7ef2bbaea5 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 15:05:11 -0700 Subject: [PATCH 18/73] added error validation for passenger new and edit --- Gemfile.lock | 2 ++ app/controllers/passengers_controller.rb | 8 ++++++-- app/models/passenger.rb | 1 + app/views/passengers/_form.html.erb | 10 ++++++++++ config/initializers/action_view.rb | 1 + 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 config/initializers/action_view.rb diff --git a/Gemfile.lock b/Gemfile.lock index 106512ee2..abcdef8fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,6 +75,7 @@ GEM concurrent-ruby (1.0.5) crass (1.0.4) debug_inspector (0.0.3) + dynamic_form (1.1.4) erubi (1.7.1) execjs (2.7.0) ffi (1.9.25) @@ -241,6 +242,7 @@ DEPENDENCIES byebug capybara (>= 2.15) chromedriver-helper + dynamic_form guard guard-minitest jbuilder (~> 2.5) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index e4e58d6d2..ec977d1f5 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -14,6 +14,7 @@ def new def create @passenger = Passenger.new(passenger_params) + if @passenger.save redirect_to passengers_path else @@ -25,8 +26,11 @@ def edit end def update - @passenger.update(passenger_params) - redirect_to passenger_path(@passenger.id) + if @passenger.update(passenger_params) + redirect_to passenger_path(@passenger.id) + else + render :edit + end end def destroy diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 4e1d6ddbd..378401ae9 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,4 +1,5 @@ class Passenger < ApplicationRecord + validates :name, :phone_num, presence: true has_many :trips, dependent: :nullify diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index a2403db45..2f73eeb82 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -1,3 +1,13 @@ +<% if @passenger.errors.any? %> +
          + <% @passenger.errors.each do |column, message| %> +
        • + <%= column.capitalize %> <%= message %> +
          • + <% end %> +
        +<% end %> + <%= form_with model: @passenger do |f| %> <%= f.label :name %> <%= f.text_field :name %> 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 From 885613fb753fcd04e4c82a4cc29cbb1a2bd18cbe Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 15:11:44 -0700 Subject: [PATCH 19/73] updated delete popup message --- app/views/drivers/index.html.erb | 2 +- app/views/drivers/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index cc0197a01..f4ebf9873 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -5,7 +5,7 @@
      2. <%= link_to "#{driver.name}", driver_path(driver.id) %> <%= link_to "Edit", edit_driver_path(driver.id) %> - <%= link_to "Delete", driver_path(driver.id), method: :delete, data: {confirm: "Delete #{driver.name}?"} %> + <%= link_to "Delete", driver_path(driver.id), method: :delete, data: {confirm: "Delete #{driver.name}? \n(All of the associated trips will no longer have a driver listed.)"} %>
        3. <% end %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 549308c23..389db4fbb 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,7 +1,7 @@

        <%= @driver.name %>

        <%= link_to "Edit", edit_driver_path(@driver.id) %> -<%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}?"} %> +<%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}? \n(All of the associated trips will no longer have a driver listed.)"} %>

        Total Earnings: $<%= @driver.total_earnings.to_f / 100 %>

        Average Rating: <%= @driver.average_rating %>

        Trips for <%= @driver.name %>:

        From 9932e2398c0af963d3f392a4aed6514283b0e9d5 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 15:20:48 -0700 Subject: [PATCH 20/73] updated delete trip popup message --- app/views/drivers/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 389db4fbb..f7b2e3a78 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -17,11 +17,11 @@ <% @driver.trips.each do |trip| %>         - + - + <% end %> From 9291d236ec621c90edffdd885db1482e1d40d78f Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 15:21:22 -0700 Subject: [PATCH 21/73] add table to passenger show view --- app/views/passengers/show.html.erb | 23 +++++++++++++++++++---- config/routes.rb | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index c3aa0fe3c..441448f1d 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,11 +1,26 @@

        Viewing Passenger <%= @passenger.id %>

        Name: <%= @passenger.name %>

        Phone Number: <%= @passenger.phone_num %>

        -
          +

          Passenger Trips:

          +
        Trip IDDatePassengerPriceRatingDelete?
        <%= trip.id %><%= trip.date %><%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %>$<%= trip.cost.to_f / 100 %><%= trip.rating %><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip with #{trip.passenger.name}?"}%>
        <%= trip.id %><%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date %> <%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %> $<%= trip.cost.to_f / 100 %> <%= trip.rating %><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip with #{trip.passenger.name}?"}%><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%>
        + + + + + + + + <% @passenger.trips.each do |trip| %> -
      3. - <%= trip.cost %> -
        4. + + + + + + + + <% end %> +
        IDDateDriversPrice RatingDelete
        <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date%> <%= link_to "#{trip.driver.name}", driver_path(trip.driver.id)%> <%= "$#{trip.cost.to_f / 100}"%> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip with #{trip.id}?"}%>

        Total Charges: <%= "$#{@passenger.total_charges.to_f/100}"%>

        diff --git a/config/routes.rb b/config/routes.rb index 81f39540f..ba8fcf70d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,6 @@ resources :drivers resources :passengers + resources :trips # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From f3571b2517f94f683ffb416658291ba163cd8476 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 15:32:54 -0700 Subject: [PATCH 22/73] added controller and views for Trip --- app/assets/javascripts/trips.js | 2 ++ app/assets/stylesheets/trips.scss | 3 +++ app/controllers/trips_controller.rb | 16 +++++++++++++ app/helpers/trips_helper.rb | 2 ++ app/views/drivers/show.html.erb | 4 ++-- app/views/trips/edit.html.erb | 2 ++ app/views/trips/new.html.erb | 2 ++ app/views/trips/show.html.erb | 0 config/routes.rb | 5 ++++ test/controllers/trips_controller_test.rb | 29 +++++++++++++++++++++++ 10 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/trips.js create mode 100644 app/assets/stylesheets/trips.scss create mode 100644 app/controllers/trips_controller.rb create mode 100644 app/helpers/trips_helper.rb create mode 100644 app/views/trips/edit.html.erb create mode 100644 app/views/trips/new.html.erb create mode 100644 app/views/trips/show.html.erb create mode 100644 test/controllers/trips_controller_test.rb 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/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/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..3a9b1c4bf --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,16 @@ +class TripsController < ApplicationController + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end +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 diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index f7b2e3a78..bb30a5a72 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,7 +1,7 @@

        <%= @driver.name %>

        -<%= link_to "Edit", edit_driver_path(@driver.id) %> -<%= link_to "Delete", driver_path(@driver.id), method: :delete, data: {confirm: "Delete #{@driver.name}? \n(All of the associated trips will no longer have a driver listed.)"} %> +

        Total Earnings: $<%= @driver.total_earnings.to_f / 100 %>

        Average Rating: <%= @driver.average_rating %>

        Trips for <%= @driver.name %>:

        diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..c5df78150 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,2 @@ +

        Trips#edit

        +

        Find me in app/views/trips/edit.html.erb

        diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 000000000..145f5c473 --- /dev/null +++ b/app/views/trips/new.html.erb @@ -0,0 +1,2 @@ +

        Trips#new

        +

        Find me in app/views/trips/new.html.erb

        diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index 72c4e7260..f5ac02d4c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,9 @@ Rails.application.routes.draw do + get 'trips/new' + get 'trips/create' + get 'trips/edit' + get 'trips/update' + get 'trips/destroy' get 'drivers/index' get 'drivers/show' get 'drivers/edit' diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb new file mode 100644 index 000000000..b78a757fc --- /dev/null +++ b/test/controllers/trips_controller_test.rb @@ -0,0 +1,29 @@ +require "test_helper" + +describe TripsController do + it "should get new" do + get trips_new_url + value(response).must_be :success? + end + + it "should get create" do + get trips_create_url + value(response).must_be :success? + end + + it "should get edit" do + get trips_edit_url + value(response).must_be :success? + end + + it "should get update" do + get trips_update_url + value(response).must_be :success? + end + + it "should get destroy" do + get trips_destroy_url + value(response).must_be :success? + end + +end From 45a5921c64a34a5a06d4a2bcddb2989e54ef67b6 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 15:41:43 -0700 Subject: [PATCH 23/73] set before action in trips controller --- app/controllers/trips_controller.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 3a9b1c4bf..6cef91db3 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,4 +1,6 @@ class TripsController < ApplicationController + before_action :set_trip, only: [:show, :edit, :update, :destroy] + def new end @@ -13,4 +15,16 @@ def update def destroy end + + def show + end + + + private + + def set_trip + @trip = trip.find(params[:id]) + end + + end From 1e89937ccfc840a9dfc597e9c0534f8aa9e2e09a Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 16:22:40 -0700 Subject: [PATCH 24/73] fixed the delete bugs for passenger --- app/controllers/passengers_controller.rb | 5 +++-- app/controllers/trips_controller.rb | 5 +---- app/models/passenger.rb | 5 +++++ app/models/trip.rb | 3 +++ app/views/passengers/index.html.erb | 2 +- app/views/passengers/show.html.erb | 3 +++ app/views/trips/new.html.erb | 2 -- 7 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 app/views/trips/new.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index ec977d1f5..77d1e20d3 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -34,8 +34,9 @@ def update end def destroy - @passenger.destroy - redirect_to passenger_path + if @passenger.destroy + redirect_to passengers_path + end end private diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 6cef91db3..b66f9ae87 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,8 +1,5 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] - - def new - end def create end @@ -23,7 +20,7 @@ def show private def set_trip - @trip = trip.find(params[:id]) + @trip = Trip.find(params[:id]) end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 378401ae9..bc207d1dd 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -11,4 +11,9 @@ def total_charges sum end + def create_trip + driver = Driver.order("RANDOM()").limit(1) + @trip_hash = {driver_id: driver, passenger_id: self.id, date: DateTime.now, cost: rand(1..5000)} + end + end diff --git a/app/models/trip.rb b/app/models/trip.rb index 8e2566cd8..fd514d40f 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,4 +1,7 @@ class Trip < ApplicationRecord + validates :driver_id, :passenger_id, :date, :cost, presence: true + belongs_to :driver belongs_to :passenger + end diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index b06d68402..c61b7b7e1 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -4,7 +4,7 @@
      4. <%= link_to "#{passenger.name}", passenger_path(passenger.id) %> <%= link_to "Edit", edit_passenger_path(passenger.id) %> - <%= link_to "Delete", passenger_path(passenger.id), method: :delete %> + <%= link_to "Delete", passenger_path(passenger.id), method: :delete, data: {confirm: "Delete #{passenger.name}? \n(All of the associated trips will no longer have a passenger listed.)"} %>
        5. <% end %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 441448f1d..c3e042cd6 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,6 +1,9 @@

        Viewing Passenger <%= @passenger.id %>

        Name: <%= @passenger.name %>

        Phone Number: <%= @passenger.phone_num %>

        +

        Passenger Trips:

        diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb deleted file mode 100644 index 145f5c473..000000000 --- a/app/views/trips/new.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

        Trips#new

        -

        Find me in app/views/trips/new.html.erb

        From 798b74920cddc4c37289540e60fefe6406304ffa Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 16:23:14 -0700 Subject: [PATCH 25/73] trip index and show views completed --- app/controllers/passengers_controller.rb | 2 +- app/controllers/trips_controller.rb | 10 ++++++-- app/views/drivers/show.html.erb | 1 + app/views/passengers/index.html.erb | 2 +- app/views/trips/index.html.erb | 31 ++++++++++++++++++++++++ app/views/trips/show.html.erb | 30 +++++++++++++++++++++++ 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 app/views/trips/index.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index ec977d1f5..25d4e9ef8 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -35,7 +35,7 @@ def update def destroy @passenger.destroy - redirect_to passenger_path + redirect_to passengers_path end private diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 6cef91db3..6ebfcdcb7 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,6 +1,6 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] - + def new end @@ -14,6 +14,12 @@ def update end def destroy + @trip.destroy + redirect_to trips_path + end + + def index + @trips = Trip.all end def show @@ -23,7 +29,7 @@ def show private def set_trip - @trip = trip.find(params[:id]) + @trip = Trip.find(params[:id]) end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index bb30a5a72..23250a223 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -25,3 +25,4 @@ <% end %> +
        <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%>
        diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index b06d68402..c61b7b7e1 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -4,7 +4,7 @@
      5. <%= link_to "#{passenger.name}", passenger_path(passenger.id) %> <%= link_to "Edit", edit_passenger_path(passenger.id) %> - <%= link_to "Delete", passenger_path(passenger.id), method: :delete %> + <%= link_to "Delete", passenger_path(passenger.id), method: :delete, data: {confirm: "Delete #{passenger.name}? \n(All of the associated trips will no longer have a passenger listed.)"} %>
        6. <% end %> diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 000000000..53d62635c --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1,31 @@ +

        All Trips

        + + + + + + + + + + + <% @trips.each do |trip| %> + + + + <% if trip.driver %> + + <% else %> + + <% end %> + <% if trip.passenger %> + + <% else %> + + <% end %> + + + + + <%end%> +
        Trip IDDateDriverPassengerPriceRatingDelete?
        <%= trip.id %><%= trip.date %><%= link_to "#{trip.driver.name}", driver_path(trip.driver.id) %>Inactive Driver<%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %>Inactive Passenger$<%= trip.cost.to_f / 100 %><%= trip.rating %><%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%>
        diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index e69de29bb..313cdfa70 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -0,0 +1,30 @@ +

        Trip #<%= @trip.id %>

        + + + + + + + + + + + + + + + <% if @trip.driver %> + + <% else %> + + <% end %> + <% if @trip.passenger %> + + <% else %> + + <% end %> + + + + +
        Trip IDDateDriverPassengerPriceRatingDelete?
        <%= @trip.id %><%= @trip.date %><%= link_to "#{@trip.driver.name}", driver_path(@trip.driver.id) %>Inactive Driver<%= link_to "#{@trip.passenger.name}", passenger_path(@trip.passenger.id) %>Inactive Passenger$<%= @trip.cost.to_f / 100 %><%= @trip.rating %><%= link_to "Delete Trip", trip_path(@trip.id), method: :delete, data: {confirm: "Delete Trip ##{@trip.id}?"}%>
        From 728d7fe012cafd39812fdd8bb521fff9f02f3c25 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Tue, 2 Oct 2018 16:33:33 -0700 Subject: [PATCH 26/73] trips index links to individual trip show pages. trip show has an edit button --- app/views/trips/index.html.erb | 2 +- app/views/trips/show.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 53d62635c..b51a9e462 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -11,7 +11,7 @@ <% @trips.each do |trip| %> - <%= trip.id %> + <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date %> <% if trip.driver %> <%= link_to "#{trip.driver.name}", driver_path(trip.driver.id) %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 313cdfa70..c0cd66757 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -7,6 +7,7 @@ Passenger Price Rating + Edit? Delete? @@ -25,6 +26,7 @@ <% end %> $<%= @trip.cost.to_f / 100 %> <%= @trip.rating %> + <%= link_to "Edit Trip", edit_trip_path(@trip.id) %> <%= link_to "Delete Trip", trip_path(@trip.id), method: :delete, data: {confirm: "Delete Trip ##{@trip.id}?"}%> From d773d97e547c2a568d02142ca6de97f37b434a9a Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 16:48:28 -0700 Subject: [PATCH 27/73] mess with request ride options --- app/controllers/trips_controller.rb | 4 ++++ app/models/passenger.rb | 8 ++++---- app/views/passengers/show.html.erb | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index b66f9ae87..cf100ef73 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -2,6 +2,10 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] def create + raise + driver = Driver.order("RANDOM()").limit(1) + trip_hash = {driver_id: driver, passenger_id: 1, date: DateTime.now, cost: rand(1..5000)} + @trip = Trip.create(trip_hash) end def edit diff --git a/app/models/passenger.rb b/app/models/passenger.rb index bc207d1dd..bb8ea2eda 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -11,9 +11,9 @@ def total_charges sum end - def create_trip - driver = Driver.order("RANDOM()").limit(1) - @trip_hash = {driver_id: driver, passenger_id: self.id, date: DateTime.now, cost: rand(1..5000)} - end + # def create_trip + # driver = Driver.order("RANDOM()").limit(1) + # @trip_hash = {driver_id: driver, passenger_id: self.id, date: DateTime.now, cost: rand(1..5000)} + # end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index c3e042cd6..e25eb5362 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -2,8 +2,9 @@

        Name: <%= @passenger.name %>

        Phone Number: <%= @passenger.phone_num %>

        +

        Passenger Trips:

        From e74ac22dfc43dd17d2ea3faf743eeafb80880ffc Mon Sep 17 00:00:00 2001 From: jfahmy Date: Tue, 2 Oct 2018 19:16:02 -0700 Subject: [PATCH 28/73] Create button to auto generate trips for passengers --- app/controllers/trips_controller.rb | 13 +++++++------ app/models/driver.rb | 2 +- app/models/passenger.rb | 5 ----- app/views/passengers/show.html.erb | 2 +- config/routes.rb | 2 ++ 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 0091a7834..0b3abce1a 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,11 +1,13 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] - def create - raise - driver = Driver.order("RANDOM()").limit(1) - trip_hash = {driver_id: driver, passenger_id: 1, date: DateTime.now, cost: rand(1..5000)} - @trip = Trip.create(trip_hash) + def autocreate + offset = rand(Driver.count) + driver = Driver.offset(offset).first + trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(1..5000)} + @trip = Trip.new(trip_hash) + @trip.save + redirect_to trip_path(@trip.id) end def edit @@ -33,5 +35,4 @@ def set_trip @trip = Trip.find(params[:id]) end - end diff --git a/app/models/driver.rb b/app/models/driver.rb index d5c02cb4a..ee01e0128 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,5 +1,5 @@ class Driver < ApplicationRecord - validates_presence_of :name, :vin + validates_presence_of :name, :vin has_many :trips, dependent: :nullify diff --git a/app/models/passenger.rb b/app/models/passenger.rb index bb8ea2eda..378401ae9 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -11,9 +11,4 @@ def total_charges sum end - # def create_trip - # driver = Driver.order("RANDOM()").limit(1) - # @trip_hash = {driver_id: driver, passenger_id: self.id, date: DateTime.now, cost: rand(1..5000)} - # end - end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index e25eb5362..406440d04 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -2,7 +2,7 @@

        Name: <%= @passenger.name %>

        Phone Number: <%= @passenger.phone_num %>

        Passenger Trips:

        diff --git a/config/routes.rb b/config/routes.rb index f5ac02d4c..2e8f37855 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,5 +12,7 @@ resources :drivers resources :passengers resources :trips + + post 'trips/new/:id', to: "trips#autocreate", as: 'new_autotrip' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 1f791b7b9bc0491fde6d9868c64e2a4795c3bac0 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Wed, 3 Oct 2018 13:48:39 -0700 Subject: [PATCH 29/73] small change to autocreate method --- app/controllers/trips_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 0b3abce1a..118eea133 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -2,9 +2,9 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] def autocreate - offset = rand(Driver.count) - driver = Driver.offset(offset).first - trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(1..5000)} + driver_num = rand(Driver.count) + driver = Driver.offset(driver_num).first + trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(200..5000)} @trip = Trip.new(trip_hash) @trip.save redirect_to trip_path(@trip.id) From ba3e208a4963c919a6e4561d57d3369a7f6726b6 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Wed, 3 Oct 2018 14:45:30 -0700 Subject: [PATCH 30/73] adjusted route for create trips button --- app/controllers/trips_controller.rb | 13 +++++++++++-- app/views/passengers/show.html.erb | 2 +- config/routes.rb | 18 +++++------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 118eea133..e858ba57a 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,10 +1,19 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] - def autocreate + # def autocreate + # driver_num = rand(Driver.count) + # driver = Driver.offset(driver_num).first + # trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(200..5000)} + # @trip = Trip.new(trip_hash) + # @trip.save + # redirect_to trip_path(@trip.id) + # end + + def create driver_num = rand(Driver.count) driver = Driver.offset(driver_num).first - trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(200..5000)} + trip_hash = {driver_id: driver.id, passenger_id: params[:passenger_id].to_i, date: DateTime.now, cost: rand(200..5000)} @trip = Trip.new(trip_hash) @trip.save redirect_to trip_path(@trip.id) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 406440d04..b6813626a 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -2,7 +2,7 @@

        Name: <%= @passenger.name %>

        Phone Number: <%= @passenger.phone_num %>

        Passenger Trips:

        diff --git a/config/routes.rb b/config/routes.rb index 2e8f37855..9c43adb34 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,18 +1,10 @@ Rails.application.routes.draw do - get 'trips/new' - get 'trips/create' - get 'trips/edit' - get 'trips/update' - get 'trips/destroy' - get 'drivers/index' - get 'drivers/show' - get 'drivers/edit' - root 'drivers#index' - resources :drivers resources :passengers - resources :trips + resources :trips, except: :create, :new + + resources :passengers do + resources :trips, only: [:create] + end - post 'trips/new/:id', to: "trips#autocreate", as: 'new_autotrip' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 76ba8eba2c2688b7380203cb88d7b5fe7a213f41 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Wed, 3 Oct 2018 14:48:22 -0700 Subject: [PATCH 31/73] typo fix for routes --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 9c43adb34..65a6a11ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do resources :drivers resources :passengers - resources :trips, except: :create, :new + resources :trips, except: [:create, :new] resources :passengers do resources :trips, only: [:create] From 71e6ef381db6345a2b05ea3f0175d23b4531b4e8 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Wed, 3 Oct 2018 15:18:22 -0700 Subject: [PATCH 32/73] can assign a rating from the trip show page --- app/controllers/trips_controller.rb | 9 +++++++++ app/views/trips/show.html.erb | 12 +++++++++++- config/routes.rb | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index e858ba57a..d04db6e90 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -23,6 +23,11 @@ def edit end def update + if @trip.update(trip_params) + render :show + else + raise + end end def destroy @@ -44,4 +49,8 @@ def set_trip @trip = Trip.find(params[:id]) end + def trip_params + return params.require(:trip).permit(:rating, :date, :cost) + end + end diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index c0cd66757..94b1612d0 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -25,7 +25,17 @@         <% end %> - + <% if @trip.rating %> + + <% else %> + + <%end%> + diff --git a/config/routes.rb b/config/routes.rb index 9c43adb34..65a6a11ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do resources :drivers resources :passengers - resources :trips, except: :create, :new + resources :trips, except: [:create, :new] resources :passengers do resources :trips, only: [:create] From bf582536cbe7050d1fc927d9962d470917e0b765 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Wed, 3 Oct 2018 15:32:34 -0700 Subject: [PATCH 33/73] moved trip cost dollar conversion from view to model --- app/models/trip.rb | 4 ++++ app/views/drivers/show.html.erb | 2 +- app/views/passengers/show.html.erb | 2 +- app/views/trips/index.html.erb | 2 +- app/views/trips/show.html.erb | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/trip.rb b/app/models/trip.rb index fd514d40f..6f00a1a4b 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -4,4 +4,8 @@ class Trip < ApplicationRecord belongs_to :driver belongs_to :passenger + def cost_in_dollars + return "$#{self.cost.to_f / 100}" + end + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 23250a223..b3545959d 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -20,7 +20,7 @@ - + diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index b6813626a..764c4d5c3 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -20,7 +20,7 @@ - + diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index b51a9e462..58900e1f2 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -23,7 +23,7 @@ <% else %> <% end %> - + diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 94b1612d0..17aec7e61 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -24,7 +24,7 @@ <% else %> <% end %> - + <% if @trip.rating %> <% else %> From 844a6d4da82490006459f864f167e3eb37f53b2e Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Wed, 3 Oct 2018 15:36:05 -0700 Subject: [PATCH 34/73] moved passenger total charges dollar conversion from view to model --- app/models/passenger.rb | 4 ++++ app/views/passengers/show.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 378401ae9..494527788 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -11,4 +11,8 @@ def total_charges sum end + def total_charges_in_dollars + return "$#{total_charges.to_f / 100}" + end + end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 764c4d5c3..952584570 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -27,4 +27,4 @@ <% end %>
        Inactive Passenger$<%= @trip.cost.to_f / 100 %><%= @trip.rating %><%= @trip.rating %> <%= form_with model: @trip do |f| %> + <%= f.label :rating %> + <%= f.select :rating, [1, 2, 3, 4, 5] %> + <%= f.submit 'save rating', class: "form-button" %> + <% end %> + <%= link_to "Edit Trip", edit_trip_path(@trip.id) %> <%= link_to "Delete Trip", trip_path(@trip.id), method: :delete, data: {confirm: "Delete Trip ##{@trip.id}?"}%>
        <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date %> <%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %>$<%= trip.cost.to_f / 100 %><%= trip.cost_in_dollars %> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%>
        <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date%> <%= link_to "#{trip.driver.name}", driver_path(trip.driver.id)%> <%= "$#{trip.cost.to_f / 100}"%> <%= trip.cost_in_dollars %> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip with #{trip.id}?"}%>
        Inactive Passenger$<%= trip.cost.to_f / 100 %><%= trip.cost_in_dollars %> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%>
        Inactive Passenger$<%= @trip.cost.to_f / 100 %><%= @trip.cost_in_dollars %><%= @trip.rating %>
        -

        Total Charges: <%= "$#{@passenger.total_charges.to_f/100}"%>

        +

        Total Charges: <%= @passenger.total_charges_in_dollars %>

        From d49eb3b96850d3570d0c9d975c83d974447841db Mon Sep 17 00:00:00 2001 From: jfahmy Date: Wed, 3 Oct 2018 15:37:12 -0700 Subject: [PATCH 35/73] add trip edit form and links for nav --- app/assets/stylesheets/application.css | 6 ++++++ app/controllers/trips_controller.rb | 11 +---------- app/views/layouts/application.html.erb | 16 ++++++++++++++++ app/views/trips/edit.html.erb | 13 ++++++++++++- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..4a499d83c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,9 @@ *= require_tree . *= require_self */ + + nav li { + list-style-type: none; + display: inline-block; + padding-right: 5% + } diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index d04db6e90..d2177695e 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,15 +1,6 @@ class TripsController < ApplicationController before_action :set_trip, only: [:show, :edit, :update, :destroy] - # def autocreate - # driver_num = rand(Driver.count) - # driver = Driver.offset(driver_num).first - # trip_hash = {driver_id: driver.id, passenger_id: params[:id].to_i, date: DateTime.now, cost: rand(200..5000)} - # @trip = Trip.new(trip_hash) - # @trip.save - # redirect_to trip_path(@trip.id) - # end - def create driver_num = rand(Driver.count) driver = Driver.offset(driver_num).first @@ -26,7 +17,7 @@ def update if @trip.update(trip_params) render :show else - raise + render :edit end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 692ca547e..1e49578f3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,22 @@ + <%= yield %> diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb index c5df78150..7d0f1d321 100644 --- a/app/views/trips/edit.html.erb +++ b/app/views/trips/edit.html.erb @@ -1,2 +1,13 @@

        Trips#edit

        -

        Find me in app/views/trips/edit.html.erb

        +<%= form_with model: @trip do |f| %> + <%= f.label :cost %> + <%= f.text_field :cost %> + + <%= f.label :date %> + <%= f.text_field :date %> + + <%= f.label :rating %> + <%= f.select :rating, [1, 2, 3, 4, 5] %> + + <%= f.submit 'Save Trip Changes', class: "form-button" %> + <% end %> From e4ef2e06045a9e939e9e43ee89330a850984b9fe Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Wed, 3 Oct 2018 15:42:43 -0700 Subject: [PATCH 36/73] driver show can handle a nil passenger, passenger show can handle a nil driver --- app/views/drivers/show.html.erb | 8 +++++++- app/views/passengers/show.html.erb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index b3545959d..c08472217 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -19,7 +19,13 @@ <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date %> - <%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %> + + <% if trip.passenger %> + <%= link_to "#{trip.passenger.name}", passenger_path(trip.passenger.id) %> + <% else %> + Inactive Passenger + <% end %> + <%= trip.cost_in_dollars %> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip ##{trip.id}?"}%> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 952584570..7a4d354e9 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -19,7 +19,13 @@ <%= link_to "#{trip.id}", trip_path(trip.id) %> <%= trip.date%> - <%= link_to "#{trip.driver.name}", driver_path(trip.driver.id)%> + + <% if trip.driver %> + <%= link_to "#{trip.driver.name}", driver_path(trip.driver.id) %> + <% else %> + Inactive Driver + <% end %> + <%= trip.cost_in_dollars %> <%= trip.rating %> <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Delete Trip with #{trip.id}?"}%> From 976644ef7a82f2c541ace078c67802930bae3a06 Mon Sep 17 00:00:00 2001 From: jfahmy Date: Wed, 3 Oct 2018 15:57:21 -0700 Subject: [PATCH 37/73] added hover-over nav --- app/assets/stylesheets/application.css | 33 ++++++++++++++++++++++--- app/views/layouts/application.html.erb | 34 ++++++++++++++------------ 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 4a499d83c..231364e87 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,8 +14,33 @@ *= require_self */ - nav li { - list-style-type: none; - display: inline-block; - padding-right: 5% + .dropbtn { + background-color: #4CAF50; + color: white; + padding: 16px; + font-size: 16px; + border: none; } + + .dropdown { + position: relative; + display: inline-block; +} + +.dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +.dropdown:hover .dropdown-content {display: block;} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1e49578f3..16c254a40 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,22 +10,24 @@ - + + <%= yield %> From 6b038598b76e9252ab7c2a2ad5c3b36a116e58c2 Mon Sep 17 00:00:00 2001 From: Daniela Di Iorio Date: Wed, 3 Oct 2018 22:53:21 -0700 Subject: [PATCH 38/73] added pagination for driver, passenger, trips index views --- Gemfile | 2 ++ Gemfile.lock | 4 ++-- app/controllers/drivers_controller.rb | 2 +- app/controllers/passengers_controller.rb | 2 +- app/controllers/trips_controller.rb | 2 +- app/views/drivers/index.html.erb | 2 ++ app/views/passengers/index.html.erb | 2 ++ app/views/trips/index.html.erb | 2 ++ 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 53b453642..765d15b57 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } +gem 'will_paginate', '>= 3.1' + ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' diff --git a/Gemfile.lock b/Gemfile.lock index abcdef8fc..efdded0e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,6 @@ GEM concurrent-ruby (1.0.5) crass (1.0.4) debug_inspector (0.0.3) - dynamic_form (1.1.4) erubi (1.7.1) execjs (2.7.0) ffi (1.9.25) @@ -229,6 +228,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.6) xpath (3.1.0) nokogiri (~> 1.8) @@ -242,7 +242,6 @@ DEPENDENCIES byebug capybara (>= 2.15) chromedriver-helper - dynamic_form guard guard-minitest jbuilder (~> 2.5) @@ -263,6 +262,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + will_paginate (>= 3.1) RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 096414d35..b02b164d4 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -2,7 +2,7 @@ class DriversController < ApplicationController before_action :set_driver, only: [:show, :edit, :update, :destroy] def index - @drivers = Driver.all + @drivers = Driver.paginate(:page => params[:page], :per_page => 10) end def show diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 77d1e20d3..03701c5b6 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -2,7 +2,7 @@ class PassengersController < ApplicationController before_action :set_passenger, only: [:show, :edit, :update, :destroy] def index - @passengers = Passenger.all + @passengers = Passenger.paginate(:page => params[:page], :per_page => 10) end def show diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index d2177695e..9adffd878 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -27,7 +27,7 @@ def destroy end def index - @trips = Trip.all + @trips = Trip.paginate(:page => params[:page], :per_page => 10) end def show diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index f4ebf9873..6a6905f7b 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,3 +1,5 @@ +<%= will_paginate @drivers %> +

        Drivers

          diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index c61b7b7e1..d79fae0b0 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,3 +1,5 @@ +<%= will_paginate @passengers %> +

          All Passengers: