From 61d8338b8f8b8c55f44f4cf6ae0565ac4e4c03c3 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Mon, 2 Apr 2018 15:56:05 -0700 Subject: [PATCH 01/50] Create new rails project --- .gitignore | 22 ++ Gemfile | 70 ++++++ Gemfile.lock | 225 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 38 +++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 +++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 ++++++ public/422.html | 67 ++++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 74 files changed, 1294 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..e74c03379 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +/node_modules +/yarn-error.log + +.byebug_history +/coverage +.DS_Store + diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..9f37ac349 --- /dev/null +++ b/Gemfile @@ -0,0 +1,70 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.5' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..8c4827325 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,225 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + 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) + arel (8.0.0) + better_errors (2.4.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) + builder (3.2.3) + byebug (10.0.2) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0, < 4.0) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.3) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.0) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.1) + 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) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.13.1) + nio4r (2.3.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + 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.2) + puma (3.11.3) + rack (2.0.4) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + 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.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.11.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.8) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.0.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + 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.7) + rails (~> 5.1.5) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.16.1 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..46b20359f --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 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..1c07694e9 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 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..353326840 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + RideshareRails + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 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..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 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..78c4e861d --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 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..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..c2bacef83 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 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..4c6d223cf --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module 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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..db55d1026 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: rideshare-rails_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..bf1c2b58e --- /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: rideshare-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: rideshare-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: rideshare-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: rideshare-rails_production + username: rideshare-rails + password: <%= ENV['RIDESHARE-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..5187e2218 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..8eb974095 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "rideshare-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..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 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/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..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..268936b55 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..a397d66c7 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 7ede30df285ae93bc207779aaf2b24e581cd7418c944a8955919ea4fcae4b72ace3023959ead795438ce06e4a71d3fc94e33173ececbce88fbe01219eb7e183d + +test: + secret_key_base: 6e1ec3854c9029f014a4608345f6c0f1ffc1fd9fce7867dc4b4ed45918e1439a6a85c0dd911b169e7b66a8ecdb64b25ef4988cc9e05f2bc217c47f3090006a9e + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /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/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..2d821c4e4 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "rideshare-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/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 cf0327a20585a2d37ddde034f444dba7582c17bd Mon Sep 17 00:00:00 2001 From: Cara Date: Mon, 2 Apr 2018 17:05:17 -0700 Subject: [PATCH 02/50] Created Trips MVC --- app/assets/javascripts/trips.js | 2 ++ app/assets/stylesheets/trips.scss | 3 +++ app/controllers/trips_controller.rb | 4 ++++ app/helpers/trips_helper.rb | 2 ++ app/models/trip.rb | 2 ++ app/views/trips/index.html.erb | 2 ++ config/routes.rb | 17 +++++++++++++- db/migrate/20180402233853_create_trips.rb | 13 +++++++++++ db/schema.rb | 28 +++++++++++++++++++++++ test/controllers/trips_controller_test.rb | 9 ++++++++ test/fixtures/trips.yml | 17 ++++++++++++++ test/models/trip_test.rb | 9 ++++++++ 12 files changed, 107 insertions(+), 1 deletion(-) 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/models/trip.rb create mode 100644 app/views/trips/index.html.erb create mode 100644 db/migrate/20180402233853_create_trips.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/trips_controller_test.rb create mode 100644 test/fixtures/trips.yml create mode 100644 test/models/trip_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..3ad2ef30c --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,4 @@ +class TripsController < ApplicationController + def index + 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/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..a8c077a10 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,2 @@ +class Trip < ApplicationRecord +end diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 000000000..f7a748c70 --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1,2 @@ +

Trips#index

+

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

diff --git a/config/routes.rb b/config/routes.rb index 268936b55..50436b31d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,18 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get 'trips/index' + + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + + # Routes that operate on the trip collection + get '/trips', to: 'trips#index', as: 'trips' + get '/trips/new', to: 'trips#new', as: 'new_trip' + post '/trips', to: 'trips#create' + + # Routes that operate on individual trips + get '/trips/:id', to: 'trips#show', as: 'trip' + get '/trips/:id/edit', to: 'trips#edit', as: 'edit_trip' + patch '/trips/:id', to: 'trips#update' + delete '/trips/:id', to: 'trips#destroy' + end diff --git a/db/migrate/20180402233853_create_trips.rb b/db/migrate/20180402233853_create_trips.rb new file mode 100644 index 000000000..fae853fc1 --- /dev/null +++ b/db/migrate/20180402233853_create_trips.rb @@ -0,0 +1,13 @@ +class CreateTrips < ActiveRecord::Migration[5.1] + def change + create_table :trips do |t| + t.integer :driver_id + t.integer :passenger_id + t.date :date + t.integer :rating + t.float :cost + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..a03c229b0 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# 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: 20180402233853) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "trips", force: :cascade do |t| + t.integer "driver_id" + t.integer "passenger_id" + t.date "date" + t.integer "rating" + t.float "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb new file mode 100644 index 000000000..dc6f27f56 --- /dev/null +++ b/test/controllers/trips_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe TripsController do + it "should get index" do + get trips_index_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 000000000..54d480fd1 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,17 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + id: 1 + driver_id: 1 + passenger_id: 1 + date: 2018-04-02 + rating: 1 + cost: 1.5 + +two: + id: 1 + driver_id: 1 + passenger_id: 1 + date: 2018-04-02 + rating: 1 + cost: 1.5 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 aa5c9e0dc657bcfba3662c32d5a332f2c2591219 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 11:51:21 -0700 Subject: [PATCH 03/50] Refactor routes --- config/routes.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 50436b31d..c77aed645 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,15 +4,8 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - # Routes that operate on the trip collection - get '/trips', to: 'trips#index', as: 'trips' - get '/trips/new', to: 'trips#new', as: 'new_trip' - post '/trips', to: 'trips#create' - - # Routes that operate on individual trips - get '/trips/:id', to: 'trips#show', as: 'trip' - get '/trips/:id/edit', to: 'trips#edit', as: 'edit_trip' - patch '/trips/:id', to: 'trips#update' - delete '/trips/:id', to: 'trips#destroy' + resources :trips + resources :passenger + resources :driver end From 22a7d1394d875c1334befd063a5f4e09909fb72f Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 12:01:40 -0700 Subject: [PATCH 04/50] Set up Trip controller index method and view --- app/controllers/trips_controller.rb | 20 ++++++++++++++++++++ app/views/trips/index.html.erb | 11 +++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 3ad2ef30c..17bd1fad6 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,4 +1,24 @@ class TripsController < ApplicationController def index + @trips = Trip.all end + + # def new + # end + + def create + end + + def show + end + + # def edit + # end + + def update + end + + def destroy + end + end diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index f7a748c70..129e67063 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,2 +1,9 @@ -

Trips#index

-

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

+

+ passenger: + driver: + date: + rating: + cost: + edit | + delete +

From 0dac52fdd98625980ab609a16530a3f2e9f675a4 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 12:13:18 -0700 Subject: [PATCH 05/50] Set up Driver controller and active record relation between Driver and Trip --- app/assets/javascripts/driver.js | 2 ++ app/assets/stylesheets/driver.scss | 3 +++ app/controllers/driver_controller.rb | 23 +++++++++++++++++++ app/helpers/driver_helper.rb | 2 ++ app/models/driver.rb | 3 +++ app/models/trip.rb | 1 + db/migrate/20180403190520_create_drivers.rb | 10 ++++++++ ...20180403190728_remove_driver_from_trips.rb | 5 ++++ ...403191008_add_driver_reference_to_trips.rb | 5 ++++ db/schema.rb | 13 +++++++++-- test/controllers/driver_controller_test.rb | 7 ++++++ test/fixtures/drivers.yml | 9 ++++++++ test/models/driver_test.rb | 9 ++++++++ 13 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/driver.js create mode 100644 app/assets/stylesheets/driver.scss create mode 100644 app/controllers/driver_controller.rb create mode 100644 app/helpers/driver_helper.rb create mode 100644 app/models/driver.rb create mode 100644 db/migrate/20180403190520_create_drivers.rb create mode 100644 db/migrate/20180403190728_remove_driver_from_trips.rb create mode 100644 db/migrate/20180403191008_add_driver_reference_to_trips.rb create mode 100644 test/controllers/driver_controller_test.rb create mode 100644 test/fixtures/drivers.yml create mode 100644 test/models/driver_test.rb diff --git a/app/assets/javascripts/driver.js b/app/assets/javascripts/driver.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/driver.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/driver.scss b/app/assets/stylesheets/driver.scss new file mode 100644 index 000000000..6a40f21ca --- /dev/null +++ b/app/assets/stylesheets/driver.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the driver 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/driver_controller.rb b/app/controllers/driver_controller.rb new file mode 100644 index 000000000..d0d08cc61 --- /dev/null +++ b/app/controllers/driver_controller.rb @@ -0,0 +1,23 @@ +class DriverController < ApplicationController + def index + end + + def new + end + + def create + end + + def show + end + + def edit + end + + def update + end + + def destroy + end + +end diff --git a/app/helpers/driver_helper.rb b/app/helpers/driver_helper.rb new file mode 100644 index 000000000..7f09f8723 --- /dev/null +++ b/app/helpers/driver_helper.rb @@ -0,0 +1,2 @@ +module DriverHelper +end diff --git a/app/models/driver.rb b/app/models/driver.rb new file mode 100644 index 000000000..e22a3a947 --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,3 @@ +class Driver < ApplicationRecord + belongs_to :trip +end diff --git a/app/models/trip.rb b/app/models/trip.rb index a8c077a10..1fe88af56 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,2 +1,3 @@ class Trip < ApplicationRecord + has_many :drivers end diff --git a/db/migrate/20180403190520_create_drivers.rb b/db/migrate/20180403190520_create_drivers.rb new file mode 100644 index 000000000..eddae1b05 --- /dev/null +++ b/db/migrate/20180403190520_create_drivers.rb @@ -0,0 +1,10 @@ +class CreateDrivers < ActiveRecord::Migration[5.1] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + + t.timestamps + end + end +end diff --git a/db/migrate/20180403190728_remove_driver_from_trips.rb b/db/migrate/20180403190728_remove_driver_from_trips.rb new file mode 100644 index 000000000..076fc837a --- /dev/null +++ b/db/migrate/20180403190728_remove_driver_from_trips.rb @@ -0,0 +1,5 @@ +class RemoveDriverFromTrips < ActiveRecord::Migration[5.1] + def change + remove_column :trips, :driver_id + end +end diff --git a/db/migrate/20180403191008_add_driver_reference_to_trips.rb b/db/migrate/20180403191008_add_driver_reference_to_trips.rb new file mode 100644 index 000000000..2352c2ed0 --- /dev/null +++ b/db/migrate/20180403191008_add_driver_reference_to_trips.rb @@ -0,0 +1,5 @@ +class AddDriverReferenceToTrips < ActiveRecord::Migration[5.1] + def change + add_reference :trips, :driver, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index a03c229b0..a58d7c93d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,19 +10,28 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180402233853) do +ActiveRecord::Schema.define(version: 20180403191008) 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 "trips", force: :cascade do |t| - t.integer "driver_id" t.integer "passenger_id" t.date "date" t.integer "rating" t.float "cost" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "driver_id" + t.index ["driver_id"], name: "index_trips_on_driver_id" end + add_foreign_key "trips", "drivers" end diff --git a/test/controllers/driver_controller_test.rb b/test/controllers/driver_controller_test.rb new file mode 100644 index 000000000..f9ca1db00 --- /dev/null +++ b/test/controllers/driver_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe DriverController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end 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 464351224b543527078bd59dc853093aeb774b10 Mon Sep 17 00:00:00 2001 From: Cara Date: Tue, 3 Apr 2018 12:25:06 -0700 Subject: [PATCH 06/50] Initial Passenger MVC --- app/assets/javascripts/passengers.js | 2 ++ app/assets/stylesheets/passengers.scss | 3 +++ app/controllers/passengers_controller.rb | 4 ++++ app/helpers/passengers_helper.rb | 2 ++ app/models/passenger.rb | 2 ++ app/views/passengers/index.html.erb | 2 ++ config/routes.rb | 6 +++++- db/migrate/20180403191340_create_passengers.rb | 10 ++++++++++ db/schema.rb | 9 ++++++++- test/controllers/passengers_controller_test.rb | 9 +++++++++ test/fixtures/passengers.yml | 9 +++++++++ test/models/passenger_test.rb | 9 +++++++++ 12 files changed, 65 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/models/passenger.rb create mode 100644 app/views/passengers/index.html.erb create mode 100644 db/migrate/20180403191340_create_passengers.rb create mode 100644 test/controllers/passengers_controller_test.rb create mode 100644 test/fixtures/passengers.yml create mode 100644 test/models/passenger_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..abb89851f --- /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..e249ee5a8 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,4 @@ +class PassengersController < ApplicationController + def index + 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/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/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..929c1adad --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,2 @@ +

Passengers#index

+

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

diff --git a/config/routes.rb b/config/routes.rb index c77aed645..7ee42ccb3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,15 @@ Rails.application.routes.draw do + get 'passengers/index' + + get 'passenger/index' + get 'trips/index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html resources :trips - resources :passenger + resources :passengers resources :driver end diff --git a/db/migrate/20180403191340_create_passengers.rb b/db/migrate/20180403191340_create_passengers.rb new file mode 100644 index 000000000..7adf6f1df --- /dev/null +++ b/db/migrate/20180403191340_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.1] + def change + create_table :passengers do |t| + t.string :name + t.string :phonenumber + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index a03c229b0..bf6776b07 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,18 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180402233853) do +ActiveRecord::Schema.define(version: 20180403191340) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phonenumber" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "trips", force: :cascade do |t| t.integer "driver_id" t.integer "passenger_id" diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb new file mode 100644 index 000000000..0cf08ff36 --- /dev/null +++ b/test/controllers/passengers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe PassengersController do + it "should get index" do + get passengers_index_url + value(response).must_be :success? + end + +end diff --git a/test/fixtures/passengers.yml b/test/fixtures/passengers.yml new file mode 100644 index 000000000..659f7391a --- /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-number: MyString + +two: + name: MyString + phone-number: MyString 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 From d24cfbc78dd7f08e5add58c9024f32b9c06d86ce Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 12:26:12 -0700 Subject: [PATCH 07/50] Reset Driver Controller --- .../javascripts/{driver.js => drivers.js} | 0 .../stylesheets/{driver.scss => drivers.scss} | 2 +- app/controllers/driver_controller.rb | 23 --------------- app/controllers/drivers_controller.rb | 29 +++++++++++++++++++ app/helpers/driver_helper.rb | 2 -- app/helpers/drivers_helper.rb | 2 ++ app/views/drivers/index.html.erb | 6 ++++ app/views/trips/index.html.erb | 18 ++++++------ config/routes.rb | 2 +- ...ler_test.rb => drivers_controller_test.rb} | 2 +- 10 files changed, 49 insertions(+), 37 deletions(-) rename app/assets/javascripts/{driver.js => drivers.js} (100%) rename app/assets/stylesheets/{driver.scss => drivers.scss} (64%) delete mode 100644 app/controllers/driver_controller.rb create mode 100644 app/controllers/drivers_controller.rb delete mode 100644 app/helpers/driver_helper.rb create mode 100644 app/helpers/drivers_helper.rb create mode 100644 app/views/drivers/index.html.erb rename test/controllers/{driver_controller_test.rb => drivers_controller_test.rb} (76%) diff --git a/app/assets/javascripts/driver.js b/app/assets/javascripts/drivers.js similarity index 100% rename from app/assets/javascripts/driver.js rename to app/assets/javascripts/drivers.js diff --git a/app/assets/stylesheets/driver.scss b/app/assets/stylesheets/drivers.scss similarity index 64% rename from app/assets/stylesheets/driver.scss rename to app/assets/stylesheets/drivers.scss index 6a40f21ca..186a23a88 100644 --- a/app/assets/stylesheets/driver.scss +++ b/app/assets/stylesheets/drivers.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the driver controller here. +// 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/driver_controller.rb b/app/controllers/driver_controller.rb deleted file mode 100644 index d0d08cc61..000000000 --- a/app/controllers/driver_controller.rb +++ /dev/null @@ -1,23 +0,0 @@ -class DriverController < ApplicationController - def index - end - - def new - end - - def create - end - - def show - end - - def edit - end - - def update - end - - def destroy - end - -end diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..fc3d5b2c2 --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,29 @@ +class DriversController < ApplicationController + def index + @drivers = Driver.all + end + + def new + new_driver = Driver.new + end + + def create + end + + def show + 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/driver_helper.rb b/app/helpers/driver_helper.rb deleted file mode 100644 index 7f09f8723..000000000 --- a/app/helpers/driver_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DriverHelper -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/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..4dd61a90b --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,6 @@ +

+ name: + vin: + edit | + delete +

diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 129e67063..fa916e7c6 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,9 +1,9 @@ -

- passenger: - driver: - date: - rating: - cost: - edit | - delete -

+

+ passenger: + driver: + date: + rating: + cost: + edit | + delete +

diff --git a/config/routes.rb b/config/routes.rb index c77aed645..4bc9815f1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,6 @@ resources :trips resources :passenger - resources :driver + resources :drivers end diff --git a/test/controllers/driver_controller_test.rb b/test/controllers/drivers_controller_test.rb similarity index 76% rename from test/controllers/driver_controller_test.rb rename to test/controllers/drivers_controller_test.rb index f9ca1db00..3ba908d00 100644 --- a/test/controllers/driver_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe DriverController do +describe DriversController do # it "must be a real test" do # flunk "Need real tests" # end From d0ef1cd4f7272d7d2ad1bb86cc814515d81152ec Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 15:36:49 -0700 Subject: [PATCH 08/50] Update Passenger model phone number column name --- db/migrate/20180403191340_create_passengers.rb | 2 +- db/schema.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/db/migrate/20180403191340_create_passengers.rb b/db/migrate/20180403191340_create_passengers.rb index 7adf6f1df..97f19c7b4 100644 --- a/db/migrate/20180403191340_create_passengers.rb +++ b/db/migrate/20180403191340_create_passengers.rb @@ -2,7 +2,7 @@ class CreatePassengers < ActiveRecord::Migration[5.1] def change create_table :passengers do |t| t.string :name - t.string :phonenumber + t.string :phone_num t.timestamps end diff --git a/db/schema.rb b/db/schema.rb index 4479321d5..3e39fb275 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,6 @@ # # It's strongly recommended that you check this file into your version control system. - ActiveRecord::Schema.define(version: 20180403191340) do # These are extensions that must be enabled in order to support this database @@ -25,7 +24,7 @@ create_table "passengers", force: :cascade do |t| t.string "name" - t.string "phonenumber" + t.string "phone_num" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From 3fda25ba030302deefdb543536cdd9b0766e6cd8 Mon Sep 17 00:00:00 2001 From: Cara Date: Tue, 3 Apr 2018 15:52:43 -0700 Subject: [PATCH 09/50] Added Passenger-Trip relationships --- app/models/passenger.rb | 1 + app/models/trip.rb | 1 + db/migrate/20180403191340_create_passengers.rb | 2 +- .../20180403224256_remove_passenger_id_name_from_trips.rb | 5 +++++ db/migrate/20180403224950_add_passenger_id_to_trips.rb | 5 +++++ db/schema.rb | 8 +++++--- 6 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb create mode 100644 db/migrate/20180403224950_add_passenger_id_to_trips.rb diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2c5748ac2..61e1f3809 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,2 +1,3 @@ class Passenger < ApplicationRecord + belongs_to :trip end diff --git a/app/models/trip.rb b/app/models/trip.rb index 1fe88af56..3ba229a79 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,3 +1,4 @@ class Trip < ApplicationRecord has_many :drivers + has_many :passengers end diff --git a/db/migrate/20180403191340_create_passengers.rb b/db/migrate/20180403191340_create_passengers.rb index 97f19c7b4..5a24f69cb 100644 --- a/db/migrate/20180403191340_create_passengers.rb +++ b/db/migrate/20180403191340_create_passengers.rb @@ -3,7 +3,7 @@ def change create_table :passengers do |t| t.string :name t.string :phone_num - + t.timestamps end end diff --git a/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb new file mode 100644 index 000000000..3694be6ef --- /dev/null +++ b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb @@ -0,0 +1,5 @@ +class RemovePassengerIdNameFromTrips < ActiveRecord::Migration[5.1] + def change + remove_column :passenger_id + end +end diff --git a/db/migrate/20180403224950_add_passenger_id_to_trips.rb b/db/migrate/20180403224950_add_passenger_id_to_trips.rb new file mode 100644 index 000000000..6436ca33a --- /dev/null +++ b/db/migrate/20180403224950_add_passenger_id_to_trips.rb @@ -0,0 +1,5 @@ +class AddPassengerIdToTrips < ActiveRecord::Migration[5.1] + def change + add_reference :trips, :passenger, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 3e39fb275..ab2677af5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180403191340) do +ActiveRecord::Schema.define(version: 20180403224950) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,21 +24,23 @@ create_table "passengers", force: :cascade do |t| t.string "name" - t.string "phone_num" + t.string "phonenumber" t.datetime "created_at", null: false t.datetime "updated_at", null: false end create_table "trips", force: :cascade do |t| - t.integer "passenger_id" t.date "date" t.integer "rating" t.float "cost" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.bigint "driver_id" + t.bigint "passenger_id" t.index ["driver_id"], name: "index_trips_on_driver_id" + t.index ["passenger_id"], name: "index_trips_on_passenger_id" end add_foreign_key "trips", "drivers" + add_foreign_key "trips", "passengers" end From cc5b6207ac045e279ea233f7635ef30ea7e7378c Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:23:48 -0700 Subject: [PATCH 10/50] Update Driver index page --- app/models/driver.rb | 2 +- app/models/passenger.rb | 2 +- app/models/trip.rb | 4 ++-- app/views/drivers/index.html.erb | 14 +++++++++++--- ...03224256_remove_passenger_id_name_from_trips.rb | 2 +- db/schema.rb | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index e22a3a947..197e65507 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,3 @@ class Driver < ApplicationRecord - belongs_to :trip + has_many :trips end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 61e1f3809..2fef89192 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,3 @@ class Passenger < ApplicationRecord - belongs_to :trip + has_many :trips end diff --git a/app/models/trip.rb b/app/models/trip.rb index 3ba229a79..8e2566cd8 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,4 +1,4 @@ class Trip < ApplicationRecord - has_many :drivers - has_many :passengers + belongs_to :driver + belongs_to :passenger end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 4dd61a90b..4f92b3cd9 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,6 +1,14 @@

+ id: name: - vin: - edit | - delete + vin:

+<% @drivers.each_with_index do |driver, index| %> +

+ <%= driver.id %>. + <%= driver.name %> + <%= driver.vin %> + <%= link_to 'Edit', edit_driver_path(driver) %> | + <%= link_to 'Delete', driver_path(driver.id), method: :delete, data: { confirm: "Are you sure you want to delete Driver #{ driver.name }?" } %> +

+<% end %> diff --git a/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb index 3694be6ef..acf57655a 100644 --- a/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb +++ b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb @@ -1,5 +1,5 @@ class RemovePassengerIdNameFromTrips < ActiveRecord::Migration[5.1] def change - remove_column :passenger_id + remove_column :trips, :passenger_id end end diff --git a/db/schema.rb b/db/schema.rb index ab2677af5..b302486d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -24,7 +24,7 @@ create_table "passengers", force: :cascade do |t| t.string "name" - t.string "phonenumber" + t.string "phone_num" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From df2e8436b4948da3c620a8450b1d5d68abe2743b Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:27:29 -0700 Subject: [PATCH 11/50] Create show view for Driver and update show method --- app/controllers/drivers_controller.rb | 5 ++++- app/views/drivers/show.html.erb | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/views/drivers/show.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index fc3d5b2c2..2c0828b90 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -4,13 +4,16 @@ def index end def new - new_driver = Driver.new + new_driver = Driver.new(driver_params) end def create + driver = Driver.find(params[:id]) + end def show + @driver = Driver.find(params[:id]) end def edit diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..3ad03977f --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,9 @@ +

+ Driver ID: <%= @driver.id %> +

+

+ Driver name: <%= @driver.name %> +

+

+ Driver VIN: <%= @driver.vin %> +

From 417a3d60f34614dd9bbd020c78be9b33bf3fd922 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:29:39 -0700 Subject: [PATCH 12/50] Update Driver index view to link each driver to show view --- app/views/drivers/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 4f92b3cd9..bcf4c732e 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -6,7 +6,7 @@ <% @drivers.each_with_index do |driver, index| %>

<%= driver.id %>. - <%= driver.name %> + <%= link_to driver.name, driver_path(driver) %> <%= driver.vin %> <%= link_to 'Edit', edit_driver_path(driver) %> | <%= link_to 'Delete', driver_path(driver.id), method: :delete, data: { confirm: "Are you sure you want to delete Driver #{ driver.name }?" } %> From f679f40643f6a352135b28b7a5387d5f0ceeef93 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:32:54 -0700 Subject: [PATCH 13/50] Create form for Driver new and edit views --- app/views/drivers/_form.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/views/drivers/_form.html.erb diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..5afca80d5 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,14 @@ +

+ <% page_title ||= "Driver Information" %> + <%= page_title %> +

+ +<%= form_for @driver do |f| %> + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :vin %> + <%= f.text_field :vin %> + + <%= f.submit %> +<% end %> From f54a4c3cf58a04681cc4506c5c0e2fcf434a67c4 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:40:43 -0700 Subject: [PATCH 14/50] Set up new view for Driver --- app/controllers/drivers_controller.rb | 2 +- app/views/drivers/new.html.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 app/views/drivers/new.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 2c0828b90..ae9306d13 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -4,7 +4,7 @@ def index end def new - new_driver = Driver.new(driver_params) + @driver = Driver.new end def create diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..1c5777a69 --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { page_title: "Add a new driver"}%> From dcc5f271622e151175c83fb938d8dff952b7b2e8 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:49:14 -0700 Subject: [PATCH 15/50] Set up create method for Driver --- app/controllers/drivers_controller.rb | 5 ++++- app/views/drivers/index.html.erb | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index ae9306d13..12ef7a888 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -8,8 +8,11 @@ def new end def create - driver = Driver.find(params[:id]) + driver = Driver.new(driver_params) + if driver.save + redirect_to drivers_path + end end def show diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index bcf4c732e..685402456 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,3 +1,7 @@ +

+ <%= link_to 'Add Driver', new_driver_path %> +

+

id: name: From bfe58a489538437c0201c0f798bd7cb074110ab5 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:52:51 -0700 Subject: [PATCH 16/50] Set up edit view and method and update method for Driver --- app/controllers/drivers_controller.rb | 8 ++++++++ app/views/drivers/edit.html.erb | 1 + 2 files changed, 9 insertions(+) create mode 100644 app/views/drivers/edit.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 12ef7a888..0353c620a 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -20,9 +20,17 @@ def show end def edit + @driver = Driver.find(params[:id]) end def update + driver = Driver.find(params[:id]) + + driver.assign_attributes(driver_params) + + if driver.save + redirect_to driver_path(driver) + end end def destroy diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..9a7715a66 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { page_title: "Update Driver"}%> From c8a06a9434be1f1c0019db5806b0c71b451da59a Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:54:39 -0700 Subject: [PATCH 17/50] Set up destroy method for Driver --- app/controllers/drivers_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 0353c620a..806c37608 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -34,6 +34,11 @@ def update end def destroy + driver = Driver.find(params[:id]) + + if driver.destroy + redirect_to drivers_path + end end private From 03dfded129b9cc9226b9425a750655ae5098e908 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Tue, 3 Apr 2018 16:58:08 -0700 Subject: [PATCH 18/50] Update Driver show view to display information for each of the drivers' trips --- app/views/drivers/show.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 3ad03977f..4e4b8a179 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -7,3 +7,17 @@

Driver VIN: <%= @driver.vin %>

+

+ Driver's Trips: +

    + <% @driver.trips.each do |trip| %> +
  • + <%= trip.id %>. + <%= trip.date %> + <%= trip.passenger.name %> + <%= trip.rating %> + <%= trip.cost %> +
    • + <% end %> +
+

From 6dc7e14b1f3be64aee2cde12dfde32ff3bda1c71 Mon Sep 17 00:00:00 2001 From: Cara Date: Tue, 3 Apr 2018 17:02:54 -0700 Subject: [PATCH 19/50] Initial Views set up for Passenger --- app/controllers/passengers_controller.rb | 39 +++++++++++++++++++ app/models/driver.rb | 2 +- app/models/passenger.rb | 2 +- app/models/trip.rb | 4 +- app/views/passengers/_form.html.erb | 23 +++++++++++ app/views/passengers/edit.html.erb | 1 + app/views/passengers/index.html.erb | 19 ++++++++- app/views/passengers/new.html.erb | 1 + app/views/passengers/show.html.erb | 28 +++++++++++++ ...256_remove_passenger_id_name_from_trips.rb | 2 +- db/schema.rb | 2 +- 11 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 app/views/passengers/_form.html.erb create mode 100644 app/views/passengers/edit.html.erb create mode 100644 app/views/passengers/new.html.erb create mode 100644 app/views/passengers/show.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index e249ee5a8..1a319d241 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -1,4 +1,43 @@ class PassengersController < ApplicationController def index + @passengers = Passenger.all + end + + def new + @passenger = Passenger.new + end + + def create + passenger = Passenger.new(passenger_params) + if passenger.save + redirect_to passengers_path + end + end + + def show + @passenger = Passenger.find(params[:id]) + end + + def edit + @passenger = Passenger.find(params[:id]) + end + + def update + passenger = Passenger.find(params[:id]) + passenger.assign_attributes(passenger_params) + if passenger.save + redirect_to author_path(author) + end + end + + def delete + Passenger.destroy(params[:id]) + end + + + + private + def passenger_params + return params.require(:name,:phone_num) end end diff --git a/app/models/driver.rb b/app/models/driver.rb index e22a3a947..197e65507 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,3 @@ class Driver < ApplicationRecord - belongs_to :trip + has_many :trips end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 61e1f3809..2fef89192 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,3 @@ class Passenger < ApplicationRecord - belongs_to :trip + has_many :trips end diff --git a/app/models/trip.rb b/app/models/trip.rb index 3ba229a79..8e2566cd8 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,4 +1,4 @@ class Trip < ApplicationRecord - has_many :drivers - has_many :passengers + belongs_to :driver + belongs_to :passenger end diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..ab6e0b81b --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,23 @@ +

+ <% page_title ||= "Passenger Changes" %> + <%= page_title %> +

+ +<%= form_for @passenger do |f| %> +
+ <%= f.label :name %> + <%= f.text_field :name %> +
+ + + + +
+ <%= f.label :phone_num %> + <%= f.text_area :phone_num %> +
+ +
+ <%= f.submit %> +
+<% end %> diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..d44c608b6 --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form" %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 929c1adad..445be0f27 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,2 +1,17 @@ -

Passengers#index

-

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

+

Passengers

+ +
    + <% @passengers.each do |passenger| %> +
  • + <%= passenger.id %> + + <%= link_to passenger.name, passenger_path(passenger) %> + + <%= passenger.phone_num %> + + <%= link_to "Edit", edit_passenger_path(passenger) %> + <%= link_to("Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> + +
    • + <% end %> +
diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..d44c608b6 --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form" %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..88b15ebc5 --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,28 @@ +

<%= @passenger.name %>

+ +

<%= @passenger.phone_num %>

+ +
+ + +

Passenger Details

+

This passenger was charged

+

The list of trips for this passenger.

+

This passenger was charged

+
  • + <%= link_to "Edit", edit_passenger_path(@passenger) %> + <%= link_to("Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> + <%= link_to "List of Passengers", index_passenger_path %> +
    • +<% @passenger.trips.each do |trip| %> +
  • + <%= trip.id %>. + <%= trip.date %> + <%= trip.passenger.name %> + <%= trip.rating %> + <%= trip.cost %> +
    • +<% end %> + + +
    diff --git a/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb index 3694be6ef..acf57655a 100644 --- a/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb +++ b/db/migrate/20180403224256_remove_passenger_id_name_from_trips.rb @@ -1,5 +1,5 @@ class RemovePassengerIdNameFromTrips < ActiveRecord::Migration[5.1] def change - remove_column :passenger_id + remove_column :trips, :passenger_id end end diff --git a/db/schema.rb b/db/schema.rb index ab2677af5..b302486d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -24,7 +24,7 @@ create_table "passengers", force: :cascade do |t| t.string "name" - t.string "phonenumber" + t.string "phone_num" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From c5f05bdb24f083f152e8b28295deacc5e03d533b Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 4 Apr 2018 12:14:49 -0700 Subject: [PATCH 20/50] Add #total_earnings to Driver and update show view --- app/models/driver.rb | 13 +++++++++++++ app/views/drivers/show.html.erb | 3 +++ 2 files changed, 16 insertions(+) diff --git a/app/models/driver.rb b/app/models/driver.rb index 197e65507..7f15ee197 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,16 @@ +include ActionView::Helpers::NumberHelper + class Driver < ApplicationRecord has_many :trips + + def total_earnings + subtotal_cents = 0 + self.trips.each do |trip| + subtotal_cents += ( trip.cost - 165 ) + end + subtotal = subtotal_cents / 100 + total = subtotal * 0.80 + number_to_currency(total) + end + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 4e4b8a179..300fa65c5 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -7,6 +7,9 @@

    Driver VIN: <%= @driver.vin %>

    +

    + Total Driver Earnings: <%= @driver.total_earnings %> +

    Driver's Trips:

      From ace6d112a2e6c4a586b8c99ffb41b6783225a468 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 4 Apr 2018 12:19:56 -0700 Subject: [PATCH 21/50] Add #average_rating to Driver and update view --- app/models/driver.rb | 12 +++++++++++- app/views/drivers/show.html.erb | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 7f15ee197..cf89cd899 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -12,5 +12,15 @@ def total_earnings total = subtotal * 0.80 number_to_currency(total) end - + + def average_rating + total_ratings = 0.0 + self.trips.each do |trip| + total_ratings += trip.rating + end + number_of_trips = self.trips.length + average_rating = total_ratings / number_of_trips + number_with_precision(average_rating, precision: 1) + end + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 300fa65c5..b579fa411 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -10,6 +10,9 @@

      Total Driver Earnings: <%= @driver.total_earnings %>

      +

      + Driver's Average Rating: <%= @driver.average_rating %> +

      Driver's Trips:

        From 2fce30ffb961bfdcf6e5263f1af824c2ab0f829a Mon Sep 17 00:00:00 2001 From: Cara Date: Wed, 4 Apr 2018 12:25:57 -0700 Subject: [PATCH 22/50] Passenger view, edit, index, new views. --- app/views/passengers/_form.html.erb | 6 ++++ app/views/passengers/show.html.erb | 52 +++++++++++++++++++---------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index ab6e0b81b..5c5227fdc 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -21,3 +21,9 @@ <%= f.submit %> <% end %> +
        +<%= link_to("Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> +
        +
        +<%= link_to "List of Passengers", passengers_path %> +
        diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 88b15ebc5..f7fff605c 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -1,28 +1,46 @@ -

        <%= @passenger.name %>

        - -

        <%= @passenger.phone_num %>

        +
        +
        +

        Passenger Details

        +

        <%= @passenger.name %>

        +

        <%= @passenger.phone_num %>

        +
      • + <%= link_to "Edit", edit_passenger_path(@passenger) %> + <%= link_to("Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> + <%= link_to "List of Passengers", passengers_path %> +
        • +
        +
        +

        List of Trips

        + <% @passenger.trips.each do |trip| %> -

        Passenger Details

        -

        This passenger was charged

        -

        The list of trips for this passenger.

        -

        This passenger was charged

        -
      • - <%= link_to "Edit", edit_passenger_path(@passenger) %> - <%= link_to("Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> - <%= link_to "List of Passengers", index_passenger_path %> -
        • -<% @passenger.trips.each do |trip| %> -
      • - <%= trip.id %>. +
      • Trip Id + <%= trip.id %> +
        • +
      • Date: <%= trip.date %> - <%= trip.passenger.name %> +
        • +
      • Rating: <%= trip.rating %> +
        • +
      • Cost: <%= trip.cost %>
        • -<% end %> +

        + <% end %> +
        + +
        +

        This passenger was charged total.

        +
        +

        Add a new trip for the passenger

        +
        + + +
        +
        From e59002b1be4c1479145e60d9be2f3173799565ea Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 4 Apr 2018 12:27:14 -0700 Subject: [PATCH 23/50] Link each driver's trips to corresponding trip show view --- app/views/drivers/show.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index b579fa411..77951fe9c 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -23,6 +23,7 @@ <%= trip.passenger.name %> <%= trip.rating %> <%= trip.cost %> + <%= link_to 'View Trip', trip_path(trip) %> <% end %>
      From 4701cdc18958b45024afd45c63386a4875758ef4 Mon Sep 17 00:00:00 2001 From: Cara Date: Wed, 4 Apr 2018 12:42:17 -0700 Subject: [PATCH 24/50] Adding in Trips methods --- app/controllers/trips_controller.rb | 10 ++++++++++ config/routes.rb | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 17bd1fad6..ba206307e 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -4,21 +4,31 @@ def index end # def new + # @trip Trip.new # end def create + @trip = Trip.new end def show + end # def edit # end def update + end def destroy + + end + + private + def trip_params + return params.require(:trip).permit(:passenger_id, :driver_id, :rating) end end diff --git a/config/routes.rb b/config/routes.rb index 39f62f680..f2a3c9a7e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,8 +8,9 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :trips - resources :passengers + resources :trips except: [:new, :create] + resources :passengers do + resources :trips, only: [:create] resources :drivers end From 6291f00b8fa1e5bb8c1da403a399789dfb3abdf6 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 4 Apr 2018 15:41:27 -0700 Subject: [PATCH 25/50] Write create method for Trips --- app/controllers/trips_controller.rb | 10 +++++++++- config/routes.rb | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index ba206307e..889acc3ac 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -8,7 +8,15 @@ def index # end def create - @trip = Trip.new + passenger = Passenger.find_by(id: params[:passenger_id]) + driver = Driver.all.sample + cost = rand(1..5000) + date = Date.today + trip = passenger.trips.new(passenger: passenger, driver: driver, cost: cost, date: date) + + if trip.save + redirect_to trip_path(trip) + end end def show diff --git a/config/routes.rb b/config/routes.rb index f2a3c9a7e..dee573fb9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,9 +8,10 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :trips except: [:new, :create] + resources :trips, except: [:new, :create] resources :passengers do resources :trips, only: [:create] + end resources :drivers end From 5e1b303b0255f9dd3d44422ec99a4114d47bb2ad Mon Sep 17 00:00:00 2001 From: Cara Date: Wed, 4 Apr 2018 15:52:28 -0700 Subject: [PATCH 26/50] Added show method for trip and trips. --- app/controllers/trips_controller.rb | 2 +- app/views/trips/show.html.erb | 14 ++++++++++++++ config/routes.rb | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 app/views/trips/show.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 889acc3ac..366a6d752 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -20,7 +20,7 @@ def create end def show - + @trip = Trip.find(params[:id]) end # def edit diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..89fa9ff96 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,14 @@ +
      +

      Trip Details

      +

      Trip ID:<%= @trip.id %>

      +

      Passenger: <%= @trip.passenger.name %>

      +

      Driver: <%= @trip.driver.name %>

      +

      Cost: <%= @trip.cost %>

      +

      Date: <%= @trip.date %>

      +

      Rating:<%= @trip.rating %>

      +
    • + + <%= link_to("Delete", trip_path(@trip), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> + <%= link_to "List of Trips", trips_path %> +
      • +
      diff --git a/config/routes.rb b/config/routes.rb index dee573fb9..a78423d60 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,10 +8,10 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :trips, except: [:new, :create] + resources :trips, except: [:new] resources :passengers do resources :trips, only: [:create] - end + end resources :drivers end From db5aa2b1c67c0fd7a25005a6449e267efc565c57 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Wed, 4 Apr 2018 17:06:31 -0700 Subject: [PATCH 27/50] Modify Trips index view --- app/controllers/trips_controller.rb | 4 ++-- app/views/trips/index.html.erb | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 366a6d752..808a38769 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -23,8 +23,8 @@ def show @trip = Trip.find(params[:id]) end - # def edit - # end + def edit + end def update diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index fa916e7c6..c4218cab3 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,9 +1,20 @@ -

      - passenger: - driver: - date: - rating: - cost: - edit | - delete -

      +

      Trips

      + +
        + <% @trips.each do |trip| %> +
      • + + <%= link_to trip.id, trip_path(trip) %>. + + <%= trip.passenger.name %> + <%= trip.driver.name %> + <%= trip.date %> + <%= trip.rating %> + <%= trip.cost %> + + <%= link_to "Edit", edit_trip_path(trip) %> + <%= link_to("Delete", trip_path(trip), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }) %> + +
        • + <% end %> +
      From bf69b41f7213144c09afb6287ba932fe6e9eb600 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 5 Apr 2018 13:32:33 -0700 Subject: [PATCH 28/50] Set up navigation menu and home page --- app/assets/javascripts/home.js | 2 ++ app/assets/stylesheets/home.scss | 3 +++ app/controllers/home_controller.rb | 6 ++++++ app/helpers/home_helper.rb | 2 ++ app/views/home/index.html.erb | 4 ++++ app/views/layouts/application.html.erb | 13 +++++++++++++ config/routes.rb | 2 +- test/controllers/home_controller_test.rb | 7 +++++++ 8 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/home.js create mode 100644 app/assets/stylesheets/home.scss create mode 100644 app/controllers/home_controller.rb create mode 100644 app/helpers/home_helper.rb create mode 100644 app/views/home/index.html.erb create mode 100644 test/controllers/home_controller_test.rb diff --git a/app/assets/javascripts/home.js b/app/assets/javascripts/home.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/home.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/home.scss b/app/assets/stylesheets/home.scss new file mode 100644 index 000000000..f0ddc6846 --- /dev/null +++ b/app/assets/stylesheets/home.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the home 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/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 000000000..243555819 --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,6 @@ +class HomeController < ApplicationController + + def index + end + +end diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb new file mode 100644 index 000000000..23de56ac6 --- /dev/null +++ b/app/helpers/home_helper.rb @@ -0,0 +1,2 @@ +module HomeHelper +end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb new file mode 100644 index 000000000..0cea1332d --- /dev/null +++ b/app/views/home/index.html.erb @@ -0,0 +1,4 @@ +<%= link_to 'Manage Drivers', drivers_path %> + +<%= link_to 'Manage Passengers', +passengers_path %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 353326840..c0f3f8e95 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,19 @@ +
      +
        +
      • + <%= link_to 'RideshareRails', root_path %> +
        • +
      • + <%= link_to 'Drivers', drivers_path %> +
        • +
      • + <%= link_to 'Passengers', passengers_path %> +
        • +
      +
      <%= yield %> diff --git a/config/routes.rb b/config/routes.rb index a78423d60..ab3d09996 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,7 @@ get 'trips/index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - + root 'home#index' resources :trips, except: [:new] resources :passengers do diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb new file mode 100644 index 000000000..cf3d56b45 --- /dev/null +++ b/test/controllers/home_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe HomeController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 0897d09cbea8199185b133316f69129b2203ba35 Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 14:01:28 -0700 Subject: [PATCH 29/50] Added ability to delete and change rating in trip --- app/controllers/trips_controller.rb | 14 ++++++++++++++ app/views/trips/edit.html.erb | 7 +++++++ app/views/trips/show.html.erb | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/views/trips/edit.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 808a38769..7d9f02205 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -24,13 +24,27 @@ def show end def edit + @trip = Trip.find(params[:id]) + end def update + @trip = Trip.find(params[:id]) + @trip.assign_attributes(trip_params) + + if @trip.save + redirect_to trips_path + end + end def destroy + trip = Trip.find(params[:id]) + + if trip.destroy + redirect_to trips_path + end end diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..fefa62b71 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,7 @@ +<%= form_for @trip do |f| %> +

      Edit the rating for number <%= @trip.id%>

      +<%= f.label :rating %> +<% rating = [1,2,3,4,5] %> +<%= f.select :rating, rating, include_blank: false %> +<%= f.submit %> +<% end %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 89fa9ff96..1a291000b 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -6,9 +6,10 @@

      Cost: <%= @trip.cost %>

      Date: <%= @trip.date %>

      Rating:<%= @trip.rating %>

      + <%= link_to "Change the rating for this trip", edit_trip_path %>
    • - <%= link_to("Delete", trip_path(@trip), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> + <%= link_to("Delete", trip_path(@trip), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }) %> <%= link_to "List of Trips", trips_path %>
    From 96b518710fafd45edb53ed079017dcc6ab520505 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 5 Apr 2018 14:24:51 -0700 Subject: [PATCH 30/50] Update passenger to be able to request new trip --- app/controllers/trips_controller.rb | 6 +++--- app/views/passengers/show.html.erb | 2 +- app/views/trips/new.html.erb | 0 config/routes.rb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 app/views/trips/new.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 7d9f02205..f76f06772 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -3,9 +3,9 @@ def index @trips = Trip.all end - # def new - # @trip Trip.new - # end + def new + @trip = Trip.new + end def create passenger = Passenger.find_by(id: params[:passenger_id]) diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index f7fff605c..a0b0e58ff 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -38,7 +38,7 @@
    -

    Add a new trip for the passenger

    +

    <%= link_to 'Add a new trip for the passenger', passenger_trips_path(@passenger.id), method: :post %>

    diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index ab3d09996..0f89971be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,9 +8,9 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'home#index' - resources :trips, except: [:new] + resources :trips #, except: [:new] resources :passengers do - resources :trips, only: [:create] + resources :trips, only: [:new, :create] end resources :drivers From fc78abc96ade9dd3e8cdcccf6c61d57b8e593406 Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 14:39:15 -0700 Subject: [PATCH 31/50] Created links to passenger and driver in trips show page --- app/views/trips/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 1a291000b..49a590f62 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,8 +1,8 @@

    Trip Details

    Trip ID:<%= @trip.id %>

    -

    Passenger: <%= @trip.passenger.name %>

    -

    Driver: <%= @trip.driver.name %>

    +

    Passenger:<%=link_to @trip.passenger.name, passenger_path(@trip.passenger) %>

    +

    Driver:<%= link_to @trip.driver.name, driver_path(@trip.driver) %>

    Cost: <%= @trip.cost %>

    Date: <%= @trip.date %>

    Rating:<%= @trip.rating %>

    From 2b2fb1b7c348f924edaad65935e45f188642a69d Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 14:52:41 -0700 Subject: [PATCH 32/50] Completed Passenger methods and links to trips, converted cents to dollars in Passenger and Trips views. --- app/models/passenger.rb | 11 +++++++++++ app/models/trip.rb | 7 +++++++ app/views/passengers/show.html.erb | 3 ++- app/views/trips/show.html.erb | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2fef89192..c598b8278 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,14 @@ +include ActionView::Helpers::NumberHelper + class Passenger < ApplicationRecord has_many :trips + + def passenger_total + total_cost = 0 + self.trips.each do |trip | + total_cost += trip.cost + end + total_cost = total_cost/100 + return number_to_currency(total_cost) + end end diff --git a/app/models/trip.rb b/app/models/trip.rb index 8e2566cd8..9d4dfb5b9 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,4 +1,11 @@ +include ActionView::Helpers::NumberHelper class Trip < ApplicationRecord belongs_to :driver belongs_to :passenger + + +def convert_to_currency(n) + n= n/100 + return number_to_currency(n) +end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index a0b0e58ff..c6530fea7 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -28,12 +28,13 @@
  • Cost: <%= trip.cost %>
    • +
  • View Trip <%= link_to trip.id, trip_path(trip) %>

    • <% end %>
    -

    This passenger was charged total.

    +

    This passenger was charged <%= @passenger.passenger_total %>

    diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 49a590f62..e3dce0de0 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -3,7 +3,7 @@

    Trip ID:<%= @trip.id %>

    Passenger:<%=link_to @trip.passenger.name, passenger_path(@trip.passenger) %>

    Driver:<%= link_to @trip.driver.name, driver_path(@trip.driver) %>

    -

    Cost: <%= @trip.cost %>

    +

    Cost: <%= @trip.convert_to_currency(@trip.cost) %>

    Date: <%= @trip.date %>

    Rating:<%= @trip.rating %>

    <%= link_to "Change the rating for this trip", edit_trip_path %> From 9eac8403abdb18098271a9698be8de9fefa0cca4 Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 14:59:14 -0700 Subject: [PATCH 33/50] Added new passenger path --- app/views/passengers/index.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 445be0f27..670f90c16 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -10,6 +10,7 @@ <%= passenger.phone_num %> <%= link_to "Edit", edit_passenger_path(passenger) %> + <%= link_to "New", new_passenger_path(passenger) %> <%= link_to("Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> From 38ec9b54b2b8025a023590ac76674f53d4eefdc0 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 5 Apr 2018 15:00:17 -0700 Subject: [PATCH 34/50] Delete empty file --- app/views/trips/new.html.erb | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/views/trips/new.html.erb diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb deleted file mode 100644 index e69de29bb..000000000 From 1a8e1542899f17f272335576480dd74ae2f1ee56 Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 15:10:20 -0700 Subject: [PATCH 35/50] new Passenger process complete --- app/models/passenger.rb | 2 ++ app/views/passengers/_form.html.erb | 19 +++++++++++++------ app/views/passengers/index.html.erb | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index c598b8278..b7e28e346 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -2,6 +2,8 @@ class Passenger < ApplicationRecord has_many :trips + validates :phone_num, presence: true + validates :name, presence: true def passenger_total total_cost = 0 diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 5c5227fdc..fa484d4a3 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -3,15 +3,14 @@ <%= page_title %> + + <%= form_for @passenger do |f| %>
    <%= f.label :name %> <%= f.text_field :name %>
    - - -
    <%= f.label :phone_num %> <%= f.text_area :phone_num %> @@ -21,9 +20,17 @@ <%= f.submit %>
    <% end %> -
    -<%= link_to("Delete", passenger_path(@passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %> -
    +
    <%= link_to "List of Passengers", passengers_path %>
    + +<% if @passenger.errors.any? %> +
      + <% @passenger.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 670f90c16..c6aa7c6a6 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,5 +1,5 @@

    Passengers

    - +<%= link_to "Add a New Passenger", new_passenger_path%>
      <% @passengers.each do |passenger| %>
    • @@ -10,7 +10,7 @@ <%= passenger.phone_num %> <%= link_to "Edit", edit_passenger_path(passenger) %> - <%= link_to "New", new_passenger_path(passenger) %> + <%= link_to("Delete", passenger_path(passenger), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }) %>
      • From 97afa7dcdc5eb69765874955d092273f04926921 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 5 Apr 2018 15:21:22 -0700 Subject: [PATCH 36/50] Validate driver name and vin --- app/controllers/drivers_controller.rb | 8 +++++--- app/models/driver.rb | 3 +++ app/views/drivers/new.html.erb | 2 ++ app/views/layouts/_error_messages.html.erb | 12 ++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/_error_messages.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 806c37608..77f2a8857 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -4,14 +4,16 @@ def index end def new - @driver = Driver.new + @driver = Driver.new(id: params[:id]) end def create - driver = Driver.new(driver_params) + @driver = Driver.new(driver_params) - if driver.save + if @driver.save redirect_to drivers_path + else + render :new end end diff --git a/app/models/driver.rb b/app/models/driver.rb index cf89cd899..881800b45 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,6 +1,9 @@ include ActionView::Helpers::NumberHelper class Driver < ApplicationRecord + validates :name, presence: true + validates :vin, presence: true + has_many :trips def total_earnings diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 1c5777a69..ac660e965 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1 +1,3 @@ +<%= render partial: "layouts/error_messages", locals: { model: @driver } %> + <%= render partial: "form", locals: { page_title: "Add a new driver"}%> diff --git a/app/views/layouts/_error_messages.html.erb b/app/views/layouts/_error_messages.html.erb new file mode 100644 index 000000000..3149a2ce0 --- /dev/null +++ b/app/views/layouts/_error_messages.html.erb @@ -0,0 +1,12 @@ +
      + <% model.errors.messages.each do |field, message| %> + <% if !message.empty? %> +

      + ERROR: + <% message.each do |error| %> + <%= field.capitalize %> <%= error %>. + <% end %> +

      + <% end %> + <% end %> +
      From 90a01b0541175d5928de30178505b21f18d5a53d Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 15:22:19 -0700 Subject: [PATCH 37/50] Added validation to Passenger --- app/controllers/passengers_controller.rb | 4 +++- app/views/passengers/new.html.erb | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 1a319d241..e636ae61b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -11,6 +11,8 @@ def create passenger = Passenger.new(passenger_params) if passenger.save redirect_to passengers_path + else + render :new end end @@ -38,6 +40,6 @@ def delete private def passenger_params - return params.require(:name,:phone_num) + return params.require(:passenger).permit(:name,:phone_num) end end diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index d44c608b6..ac2486118 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1 +1,4 @@ + +<%= render partial: "layouts/error_messages", locals: {model @passenger} %> + <%= render partial: "form" %> From 364d2d021cd86fd06a69e01d918f470bc81e8c2e Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 15:26:48 -0700 Subject: [PATCH 38/50] Fixed some typos around AR validation --- app/controllers/passengers_controller.rb | 4 ++-- app/views/passengers/_form.html.erb | 10 ---------- app/views/passengers/new.html.erb | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index e636ae61b..b2af0e308 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -8,8 +8,8 @@ def new end def create - passenger = Passenger.new(passenger_params) - if passenger.save + @passenger = Passenger.new(passenger_params) + if @passenger.save redirect_to passengers_path else render :new diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index fa484d4a3..9a2b6699a 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -24,13 +24,3 @@
      <%= link_to "List of Passengers", passengers_path %>
      - -<% if @passenger.errors.any? %> -
        - <% @passenger.errors.each do |column, message| %> -
      • - <%= column.capitalize %> <%= message %> -
        • - <% end %> -
      -<% end %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index ac2486118..085cf1283 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,4 +1,4 @@ -<%= render partial: "layouts/error_messages", locals: {model @passenger} %> +<%= render partial: "layouts/error_messages", locals: {model: @passenger} %> <%= render partial: "form" %> From 19a309ef60aa3cb631324933d0c0b2b624b7eff4 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Thu, 5 Apr 2018 18:14:16 -0700 Subject: [PATCH 39/50] Set styles for navigation menu over entire site --- app/assets/stylesheets/application.css | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..6a86f0641 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,38 @@ *= require_tree . *= require_self */ + +* { + font-family: Futura, sans-serif; +} + +body { + margin: 0; +} + +header ul { + list-style: none; + background-color: #7280B3; + margin: 0; + height: 50px; + display: flex; + justify-content: center; + align-items: center; +} + +header ul li:first-child { + text-align: left; + flex: 2; +} + +header ul li { + text-align: center; + display: inline-block; + min-width: 100px; + flex: 1; +} + +header ul li a { + text-decoration: none; + color: #ffffff; +} From 4b21095d26f66d2a18989ad6d2408b75886a2f11 Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 20:13:33 -0700 Subject: [PATCH 40/50] initial css for passenger --- app/assets/stylesheets/passengers.scss | 19 +++++++++++++++++++ app/views/passengers/index.html.erb | 19 ++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index abb89851f..7a752d0d2 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -1,3 +1,22 @@ // 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/ +ul{ + list-style: none; + text-decoration: none; + display:flex; + flex-wrap: wrap; + + + +} + +.passenger-box{ + padding: 4em; + display: flex; + flex-direction: column; + text-align: center; +border:1px solid powderblue; +align-content: flex-end; +background-image: linear-gradient(white, powderblue, lightblue); +} diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index c6aa7c6a6..43a553ffd 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,18 +1,31 @@ +

      Passengers

      + <%= link_to "Add a New Passenger", new_passenger_path%> + +
        + <% @passengers.each do |passenger| %> +
      • <%= passenger.id %> <%= link_to passenger.name, passenger_path(passenger) %> +
        • + +
      • <%= passenger.phone_num %> - +
        • + +
        <% end %> +
      From cefa947e2527849d8ddcd5cc98dc866e9c27698e Mon Sep 17 00:00:00 2001 From: Cara Date: Thu, 5 Apr 2018 20:30:49 -0700 Subject: [PATCH 41/50] More CSS styling for Passenger index --- app/assets/stylesheets/passengers.scss | 18 ++++++++++++++++++ app/views/passengers/index.html.erb | 2 ++ 2 files changed, 20 insertions(+) diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index 7a752d0d2..5b6f60121 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -7,8 +7,14 @@ ul{ display:flex; flex-wrap: wrap; +} +h2{ + text-align: center; +} +.add-link{ + text-align: center; } .passenger-box{ @@ -19,4 +25,16 @@ ul{ border:1px solid powderblue; align-content: flex-end; background-image: linear-gradient(white, powderblue, lightblue); + +} + +.passenger-box a:link { + color: #000000; + text-decoration: none; +} +.passenger-box a:visited { + color: #800000; +} +.passenger-box a:hover { + color: #7280B3; } diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 43a553ffd..29287cdd4 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,7 +1,9 @@

      Passengers

      +
      <%= link_to "Add a New Passenger", new_passenger_path%> +
        From 8114331c25ac97a562f85f834d33ce9d4d283ef2 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 6 Apr 2018 13:50:54 -0700 Subject: [PATCH 42/50] Add styles to trips --- app/assets/stylesheets/trips.scss | 27 +++++++++++++++++ app/views/trips/index.html.erb | 48 ++++++++++++++++++++++++------- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss index f1f72ad11..dffeb6d1a 100644 --- a/app/assets/stylesheets/trips.scss +++ b/app/assets/stylesheets/trips.scss @@ -1,3 +1,30 @@ // 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/ +ul.trip { + display: block; +} + +ul.trip-line { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; +} + +ul.trip-line li { + display: inline-block; +} + +ul.trip > li:nth-child(even) { + background-color: #ccc; +} + +a:link { + color: #000000; + text-decoration: none; +} +a:visited { + color: #800000; +} +a:hover { + color: #7280B3; +} diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index c4218cab3..3f3bb989a 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,19 +1,45 @@

        Trips

        -
          +
            +
          • +
              +
            • Trip ID
              • +
            • Passenger Name
              • +
            • Driver Name
              • +
            • Date
              • +
            • Rating
              • +
            • Cost
              • +
            +
            • <% @trips.each do |trip| %>
          • - - <%= link_to trip.id, trip_path(trip) %>. - - <%= trip.passenger.name %> - <%= trip.driver.name %> - <%= trip.date %> - <%= trip.rating %> - <%= trip.cost %> +
              +
            • + <%= link_to trip.id, trip_path(trip) %> +
              • +
            • + <%= trip.passenger.name %> +
              • +
            • + <%= trip.driver.name %> +
              • +
            • + <%= trip.date %> +
              • +
            • + <%= trip.rating %> +
              • +
            • + <%= trip.cost %> +
              • +
            • + <%= link_to "Edit", edit_trip_path(trip) %> +
              • +
            • + <%= link_to("Delete", trip_path(trip), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }) %> +
              • +
            - <%= link_to "Edit", edit_trip_path(trip) %> - <%= link_to("Delete", trip_path(trip), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }) %>
            • <% end %> From eaf7222c8da2c89b73f21193a1009168f6646cce Mon Sep 17 00:00:00 2001 From: Cara Date: Fri, 6 Apr 2018 14:03:32 -0700 Subject: [PATCH 43/50] final CSS drying --- app/assets/stylesheets/application.css | 15 +++++++++++++++ app/assets/stylesheets/passengers.scss | 13 +------------ app/assets/stylesheets/trips.scss | 11 ----------- app/models/trip.rb | 2 +- app/views/trips/index.html.erb | 4 ++-- 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 6a86f0641..1bd31b566 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -48,3 +48,18 @@ header ul li a { text-decoration: none; color: #ffffff; } + +header a:hover { + color: #000000; +} + +a:link { + color: #7280B3; + text-decoration: none; +} +a:visited { + color: #800000; +} +a:hover { + color: #000000; +} diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index 5b6f60121..6262a40d3 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -24,17 +24,6 @@ h2{ text-align: center; border:1px solid powderblue; align-content: flex-end; -background-image: linear-gradient(white, powderblue, lightblue); +background-image: linear-gradient(#7280B3, white ,#800000); } - -.passenger-box a:link { - color: #000000; - text-decoration: none; -} -.passenger-box a:visited { - color: #800000; -} -.passenger-box a:hover { - color: #7280B3; -} diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss index dffeb6d1a..c69cc3a30 100644 --- a/app/assets/stylesheets/trips.scss +++ b/app/assets/stylesheets/trips.scss @@ -17,14 +17,3 @@ ul.trip-line li { ul.trip > li:nth-child(even) { background-color: #ccc; } - -a:link { - color: #000000; - text-decoration: none; -} -a:visited { - color: #800000; -} -a:hover { - color: #7280B3; -} diff --git a/app/models/trip.rb b/app/models/trip.rb index 9d4dfb5b9..40b5249c4 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -5,7 +5,7 @@ class Trip < ApplicationRecord def convert_to_currency(n) - n= n/100 + n = n/100 return number_to_currency(n) end end diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 3f3bb989a..28be0734d 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -8,7 +8,7 @@
          • Driver Name
          • Date
          • Rating
            • -
          • Cost
            • +
          • Cost:
          <% @trips.each do |trip| %> @@ -30,7 +30,7 @@ <%= trip.rating %>
        • - <%= trip.cost %> + <%=trip.convert_to_currency(trip.cost) %>
        • <%= link_to "Edit", edit_trip_path(trip) %> From d55b7bf25d468afe8499a8df2bd1552b41620a79 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 6 Apr 2018 14:17:45 -0700 Subject: [PATCH 44/50] Add Driver styles and update navigation menu styles --- app/assets/stylesheets/application.css | 1 + app/assets/stylesheets/drivers.scss | 26 +++++++++++++++++++ app/assets/stylesheets/home.scss | 5 ++++ app/controllers/trips_controller.rb | 2 +- app/views/drivers/index.html.erb | 36 +++++++++++++++++++++++--- app/views/home/index.html.erb | 2 ++ app/views/layouts/application.html.erb | 3 +++ app/views/trips/index.html.erb | 6 ++--- 8 files changed, 73 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1bd31b566..fda61cb6a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -45,6 +45,7 @@ header ul li { } header ul li a { + margin: 0; text-decoration: none; color: #ffffff; } diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss index 186a23a88..51a181bd4 100644 --- a/app/assets/stylesheets/drivers.scss +++ b/app/assets/stylesheets/drivers.scss @@ -1,3 +1,29 @@ // 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/ +ul{ + list-style: none; + text-decoration: none; + display:flex; + flex-wrap: wrap; + +} + +h2{ + text-align: center; +} + +.add-link{ + text-align: center; +} + +.driver-box{ + padding: 4em; + display: flex; + flex-direction: column; + text-align: center; +border:1px solid powderblue; +align-content: flex-end; +background-image: linear-gradient(#7280B3, white ,#800000); + +} diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index f0ddc6846..81a31fa8c 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -1,3 +1,8 @@ // Place all the styles related to the home controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +a { + display: block; + margin: 20px; +} diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index f76f06772..6dabc9f2d 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,6 +1,6 @@ class TripsController < ApplicationController def index - @trips = Trip.all + @trips = Trip.all.order(:id) end def new diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 685402456..27d224946 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,7 +1,35 @@ -

          - <%= link_to 'Add Driver', new_driver_path %> -

          +

          Drivers

          + +
          +<%= link_to "Add a New Driver", new_driver_path%> +
          + +
            + + <% @drivers.each do |driver| %> +
            +
          • + <%= driver.id %> + + <%= link_to driver.name, driver_path(driver) %> + +
            • + +
          • + <%= driver.vin %> +
            • + +
            + <% end %> +
          + diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0cea1332d..b05e51048 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -2,3 +2,5 @@ <%= link_to 'Manage Passengers', passengers_path %> + +<%= link_to "View Trips", trips_path %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c0f3f8e95..6d01f3470 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,6 +20,9 @@
        • <%= link_to 'Passengers', passengers_path %>
          • +
        • + <%= link_to 'Trips', trips_path %> +
        <%= yield %> diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index 28be0734d..b401d6cdf 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -18,16 +18,16 @@ <%= link_to trip.id, trip_path(trip) %>
      • - <%= trip.passenger.name %> + <%= link_to trip.passenger.name, passenger_path(trip.passenger) %>
      • - <%= trip.driver.name %> + <%= link_to trip.driver.name, driver_path(trip.driver) %>
      • <%= trip.date %>
      • - <%= trip.rating %> + <%= link_to trip.rating, edit_trip_path(trip) %>
      • <%=trip.convert_to_currency(trip.cost) %> From 15fa107110cd8ae26e5134adbeaaf90bdac23df6 Mon Sep 17 00:00:00 2001 From: Cara Date: Fri, 6 Apr 2018 14:47:31 -0700 Subject: [PATCH 45/50] Added search bar for passenger index view --- app/controllers/passengers_controller.rb | 5 +++++ app/models/passenger.rb | 7 +++++++ app/views/passengers/index.html.erb | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index b2af0e308..b129659dc 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -1,6 +1,11 @@ class PassengersController < ApplicationController def index @passengers = Passenger.all + if params[:search] + @passengers = Passenger.search(params[:search]).order("created_at DESC") + else + @passengers = Passenger.all.order('created_at DESC') + end end def new diff --git a/app/models/passenger.rb b/app/models/passenger.rb index b7e28e346..f7489148a 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -13,4 +13,11 @@ def passenger_total total_cost = total_cost/100 return number_to_currency(total_cost) end + + +def self.search(search) + where("name ILIKE ? or phone_num ILIKE ?", "%#{search}%", "%#{search}%") +end + + end diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 29287cdd4..502b27093 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,5 +1,17 @@

        Passengers

        +Search Form + +<%= form_tag(passengers_path, :method => "get", id: "search-form") do %> +<%= text_field_tag :search, params[:search], placeholder: "Search Passengers" %> +<%= submit_tag "Search" %> +<% end %> + + + +<% if !(@passengers.present?) %> +

        There are no passengers containing the term(s) <%= params[:search] %>.

        +<% end %>
        <%= link_to "Add a New Passenger", new_passenger_path%> From c49350b3c124ff5f97cb2168ff3974341199a932 Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 6 Apr 2018 14:56:19 -0700 Subject: [PATCH 46/50] Add form styles --- app/assets/stylesheets/application.css | 14 ++++++++++++++ app/views/passengers/_form.html.erb | 2 +- app/views/trips/index.html.erb | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index fda61cb6a..5c8832d99 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -64,3 +64,17 @@ a:visited { a:hover { color: #000000; } + +form div { + margin: 20px; +} + +form div label { + display: inline-block; + min-width: 100px; +} + +form input[type="text"] { + border: solid 1px #ccc; + min-height: 20px; +} diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 9a2b6699a..ab8d72fa8 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -13,7 +13,7 @@
        <%= f.label :phone_num %> - <%= f.text_area :phone_num %> + <%= f.text_field :phone_num %>
        diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index b401d6cdf..b312759b4 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -27,7 +27,8 @@ <%= trip.date %>
      • - <%= link_to trip.rating, edit_trip_path(trip) %> + <% trip_name = trip.rating.nil? ? "add rating" : trip.rating %> + <%= link_to trip_name, edit_trip_path(trip) %>
      • <%=trip.convert_to_currency(trip.cost) %> From b0e7eaefa3fc3ad967df017304d26ecc0430b3bb Mon Sep 17 00:00:00 2001 From: Cara Date: Fri, 6 Apr 2018 15:06:41 -0700 Subject: [PATCH 47/50] Added a search bar for drivers --- app/controllers/drivers_controller.rb | 5 +++++ app/models/driver.rb | 4 ++++ app/views/drivers/index.html.erb | 8 ++++++++ app/views/passengers/index.html.erb | 2 -- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 77f2a8857..aa2002bf1 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -1,6 +1,11 @@ class DriversController < ApplicationController def index @drivers = Driver.all + if params[:search] + @drivers = Driver.search(params[:search]).order("created_at DESC") + else + @drivers = Driver.all.order('created_at DESC') + end end def new diff --git a/app/models/driver.rb b/app/models/driver.rb index 881800b45..38db7834f 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -26,4 +26,8 @@ def average_rating number_with_precision(average_rating, precision: 1) end + def self.search(search) + where("name ILIKE ? or vin ILIKE ?", "%#{search}%", "%#{search}%") + end + end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 27d224946..6bd5a5280 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,8 +1,16 @@

        Drivers

        +<%= form_tag(drivers_path, :method => "get", id: "search-form") do %> +<%= text_field_tag :search, params[:search], placeholder: "Search Drivers" %> +<%= submit_tag "Search" %> +<% end %> +
        <%= link_to "Add a New Driver", new_driver_path%>
        +<% if !(@drivers.present?) %> +

        There are no drivers containing the term(s) <%= params[:search] %>.

        +<% end %>
          diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 502b27093..01a2ca4b2 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -7,8 +7,6 @@ Search Form <%= submit_tag "Search" %> <% end %> - - <% if !(@passengers.present?) %>

          There are no passengers containing the term(s) <%= params[:search] %>.

          <% end %> From adc5778e733f7d5981670d0da67d805fbe414fdd Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 6 Apr 2018 15:12:59 -0700 Subject: [PATCH 48/50] Add more form styles --- app/assets/stylesheets/application.css | 9 +++++++++ app/views/drivers/_form.html.erb | 11 +++++++++++ app/views/drivers/edit.html.erb | 2 +- app/views/passengers/_form.html.erb | 2 +- app/views/passengers/edit.html.erb | 2 +- app/views/passengers/new.html.erb | 2 +- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5c8832d99..03c248cdf 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -65,6 +65,10 @@ a:hover { color: #000000; } +form { + margin: 20px; +} + form div { margin: 20px; } @@ -78,3 +82,8 @@ form input[type="text"] { border: solid 1px #ccc; min-height: 20px; } + +form input[type="submit"] { + border: solid 1px #ccc; + min-height: 20px; +} diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index 5afca80d5..8c1e954f4 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -4,11 +4,22 @@ <%= form_for @driver do |f| %> +
          <%= f.label :name %> <%= f.text_field :name %> +
          +
          <%= f.label :vin %> <%= f.text_field :vin %> +
          +
          <%= f.submit %> +
          + <% end %> + +
          +<%= link_to "List of Drivers", drivers_path %> +
          diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb index 9a7715a66..da6e9dfee 100644 --- a/app/views/drivers/edit.html.erb +++ b/app/views/drivers/edit.html.erb @@ -1 +1 @@ -<%= render partial: "form", locals: { page_title: "Update Driver"}%> +<%= render partial: "form", locals: { page_title: "Update Driver"} %> diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index ab8d72fa8..b7a9530bf 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -1,5 +1,5 @@

          - <% page_title ||= "Passenger Changes" %> + <% page_title ||= "Passenger Information" %> <%= page_title %>

          diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb index d44c608b6..812bcee71 100644 --- a/app/views/passengers/edit.html.erb +++ b/app/views/passengers/edit.html.erb @@ -1 +1 @@ -<%= render partial: "form" %> +<%= render partial: "form", locals: { page_title: "Update Passenger"} %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 085cf1283..4266b43df 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,4 +1,4 @@ <%= render partial: "layouts/error_messages", locals: {model: @passenger} %> -<%= render partial: "form" %> +<%= render partial: "form", locals: { page_title: "Add a new passenger"} %> From 96c2c8aa61f0fe6be42bf8f316b91748d5c49b1d Mon Sep 17 00:00:00 2001 From: Angelica Maria Ceja Morales Date: Fri, 6 Apr 2018 15:30:28 -0700 Subject: [PATCH 49/50] Update form styles for search --- app/assets/stylesheets/passengers.scss | 4 ++++ app/views/passengers/index.html.erb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss index 6262a40d3..487fc4f94 100644 --- a/app/assets/stylesheets/passengers.scss +++ b/app/assets/stylesheets/passengers.scss @@ -27,3 +27,7 @@ align-content: flex-end; background-image: linear-gradient(#7280B3, white ,#800000); } + +section.passenger-form { + text-align: center; +} diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 502b27093..9112d10fe 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -1,11 +1,13 @@

          Passengers

          -Search Form +
          <%= form_tag(passengers_path, :method => "get", id: "search-form") do %> +

          Search Form

          <%= text_field_tag :search, params[:search], placeholder: "Search Passengers" %> <%= submit_tag "Search" %> <% end %> +
          From 3ba3d90707008037c4a985083fcf4d527174d091 Mon Sep 17 00:00:00 2001 From: Cara Date: Fri, 6 Apr 2018 15:39:54 -0700 Subject: [PATCH 50/50] Trips changes --- app/controllers/drivers_controller.rb | 4 ++-- app/controllers/passengers_controller.rb | 4 ++-- app/controllers/trips_controller.rb | 5 +++++ app/models/trip.rb | 4 ++++ app/views/trips/index.html.erb | 8 ++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index aa2002bf1..d56d1a7e7 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -2,9 +2,9 @@ class DriversController < ApplicationController def index @drivers = Driver.all if params[:search] - @drivers = Driver.search(params[:search]).order("created_at DESC") + @drivers = Driver.search(params[:search]).order("created_at ASC") else - @drivers = Driver.all.order('created_at DESC') + @drivers = Driver.all.order('created_at ASC') end end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index b129659dc..f61125397 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -2,9 +2,9 @@ class PassengersController < ApplicationController def index @passengers = Passenger.all if params[:search] - @passengers = Passenger.search(params[:search]).order("created_at DESC") + @passengers = Passenger.search(params[:search]).order("created_at ASC") else - @passengers = Passenger.all.order('created_at DESC') + @passengers = Passenger.all.order('created_at ASC') end end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 6dabc9f2d..63eb0a26c 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,6 +1,11 @@ class TripsController < ApplicationController def index @trips = Trip.all.order(:id) + if params[:search] + @trips = Trip.search(params[:search]).order("created_at ASC") + else + @trips = Trip.all.order('created_at ASC') + end end def new diff --git a/app/models/trip.rb b/app/models/trip.rb index 40b5249c4..30f8d0481 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -8,4 +8,8 @@ def convert_to_currency(n) n = n/100 return number_to_currency(n) end + +def self.search(search) + where("rating = ?", "#{search}") +end end diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index b401d6cdf..88977afd6 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,5 +1,12 @@

          Trips

          +<%= form_tag(trips_path, :method => "get", id: "search-form") do %> +<%= text_field_tag :search, params[:search], placeholder: "1 - 5" %> +<%= submit_tag "Search by Rating" %> +<% end %> +<% if !(@trips.present?) %> +

          There are no trips containing the term(s) <%= params[:search] %>.

          +<% end %>
            • @@ -41,6 +48,7 @@
            +
            • <% end %>