From 1135322dd54432fa1b634894d11aac38aabac2e0 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 11:24:57 -0700 Subject: [PATCH 01/67] Ran rails new --- .gitignore | 30 ++ .ruby-version | 1 + Gemfile | 80 ++++++ Gemfile.lock | 269 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 26 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 26 ++ tmp/.keep | 0 vendor/.keep | 0 79 files changed, 1389 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..11a546eaa --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history +/coverage +.DS_Store + + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..53b453642 --- /dev/null +++ b/Gemfile @@ -0,0 +1,80 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..106512ee2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,269 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + byebug (10.0.2) + capybara (3.8.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.4 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..82e6f0f6c --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..739aa5f02 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d05ea0f51 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..09705d12a --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..692ca547e --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + RideShareRails + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..39685a85a --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module RideShareRails + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0b6186ad8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: ride-share-rails_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..fa2e547c6 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +KuXKIlhC06mKWjw5a7/C7V5B8ZDazeOh+1w/4PfzayMCKQZuLtsAdbbjZJ1kQj4cpKzpaf1hOo1tCYBOZJUURhYBpMKMq8KWgvKHUdApL+CJowDfsRh6s6MNgAUPgLID9mKYUp6tLGfdWLOz8zV9k+tOTJENvURpGuhILM/XXl96/9VJiXwwNkb3y/aDvADL+KCHKi+F6geSG983emOD/smGv4tXeuNgIhLLL8iZGLaLq90ePu5rlMoTFn0KAA7V4OC+sSUgPRXNSVVLp5OI+NZ6uoeOHVSBXmKq+8PIs2PgYcgPqkeBbhKNYjG/DRgy1K2W4jeZbHlVznMzXAjzsSjk1KqfNe0Wz9kn1Q3uQFzbOD1I7RoJ+1kNUbLFQEQC05K/0XjScdv5EYVKc/c1tOFcPlY/G1SewPdW--rR8X2mVXZ74nptcs--khF7HTGfwZ/UOF3a8Q9q3A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..684902e69 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: ride-share-rails_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: ride-share-rails + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: ride-share-rails_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: ride-share-rails_production + username: ride-share-rails + password: <%= ENV['RIDE-SHARE-RAILS_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..cee449f7b --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "ride-share-rails_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json new file mode 100644 index 000000000..75b35d319 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "ride-share-rails", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From d45804ec50a9f2df845ffc6cecb288f21438ac0d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 11:37:13 -0700 Subject: [PATCH 02/67] creates passenger model --- app/models/passenger.rb | 2 ++ db/migrate/20181002183528_create_passengers.rb | 10 ++++++++++ db/schema.rb | 18 ++++++++++++++++++ test/fixtures/passengers.yml | 9 +++++++++ test/models/passenger_test.rb | 9 +++++++++ 5 files changed, 48 insertions(+) create mode 100644 app/models/passenger.rb create mode 100644 db/migrate/20181002183528_create_passengers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/passengers.yml create mode 100644 test/models/passenger_test.rb diff --git a/app/models/passenger.rb b/app/models/passenger.rb new file mode 100644 index 000000000..2c5748ac2 --- /dev/null +++ b/app/models/passenger.rb @@ -0,0 +1,2 @@ +class Passenger < ApplicationRecord +end diff --git a/db/migrate/20181002183528_create_passengers.rb b/db/migrate/20181002183528_create_passengers.rb new file mode 100644 index 000000000..8bb6e428d --- /dev/null +++ b/db/migrate/20181002183528_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + t.string :phone_num + t.string :name + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/fixtures/passengers.yml b/test/fixtures/passengers.yml new file mode 100644 index 000000000..8712d737c --- /dev/null +++ b/test/fixtures/passengers.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + phone_num: MyString + name: MyString + +two: + phone_num: MyString + name: 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 c117254d085dd7b5e8f63bede51e24be07de4d82 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 11:52:13 -0700 Subject: [PATCH 03/67] sets up trips, passengers, drivers databases --- app/models/driver.rb | 2 ++ app/models/trip.rb | 2 ++ db/migrate/20181002183753_create_drivers.rb | 10 +++++++ db/migrate/20181002184623_create_trips.rb | 11 +++++++ ...84726_add_driver_and_passenger_to_trips.rb | 6 ++++ db/schema.rb | 30 ++++++++++++++++++- test/fixtures/drivers.yml | 9 ++++++ test/fixtures/trips.yml | 11 +++++++ test/models/driver_test.rb | 9 ++++++ test/models/trip_test.rb | 9 ++++++ 10 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 app/models/driver.rb create mode 100644 app/models/trip.rb create mode 100644 db/migrate/20181002183753_create_drivers.rb create mode 100644 db/migrate/20181002184623_create_trips.rb create mode 100644 db/migrate/20181002184726_add_driver_and_passenger_to_trips.rb create mode 100644 test/fixtures/drivers.yml create mode 100644 test/fixtures/trips.yml create mode 100644 test/models/driver_test.rb create mode 100644 test/models/trip_test.rb diff --git a/app/models/driver.rb b/app/models/driver.rb new file mode 100644 index 000000000..1ff364562 --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,2 @@ +class Driver < ApplicationRecord +end diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..a8c077a10 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,2 @@ +class Trip < ApplicationRecord +end diff --git a/db/migrate/20181002183753_create_drivers.rb b/db/migrate/20181002183753_create_drivers.rb new file mode 100644 index 000000000..b166e4286 --- /dev/null +++ b/db/migrate/20181002183753_create_drivers.rb @@ -0,0 +1,10 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + + t.timestamps + end + end +end diff --git a/db/migrate/20181002184623_create_trips.rb b/db/migrate/20181002184623_create_trips.rb new file mode 100644 index 000000000..121ba74f5 --- /dev/null +++ b/db/migrate/20181002184623_create_trips.rb @@ -0,0 +1,11 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.date :date + t.integer :rating + t.integer :cost + + t.timestamps + end + end +end diff --git a/db/migrate/20181002184726_add_driver_and_passenger_to_trips.rb b/db/migrate/20181002184726_add_driver_and_passenger_to_trips.rb new file mode 100644 index 000000000..ea13957fe --- /dev/null +++ b/db/migrate/20181002184726_add_driver_and_passenger_to_trips.rb @@ -0,0 +1,6 @@ +class AddDriverAndPassengerToTrips < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :passenger, foreign_key: true + add_reference :trips, :driver, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..16808b1d0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,37 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2018_10_02_184726) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "drivers", force: :cascade do |t| + t.string "name" + t.string "vin" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "passengers", force: :cascade do |t| + t.string "phone_num" + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.date "date" + t.integer "rating" + t.integer "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "passenger_id" + t.bigint "driver_id" + t.index ["driver_id"], name: "index_trips_on_driver_id" + t.index ["passenger_id"], name: "index_trips_on_passenger_id" + end + + add_foreign_key "trips", "drivers" + add_foreign_key "trips", "passengers" end 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/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 000000000..a3b2d0876 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + date: + rating: 1 + cost: 1 + +two: + date: + rating: 1 + cost: 1 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 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 5b08f629b90405940098f3bf5713adb0f9fb27c1 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 15:24:34 -0700 Subject: [PATCH 04/67] adds Passenger index action and view --- app/assets/javascripts/passengers.js | 2 ++ app/assets/stylesheets/passengers.scss | 3 +++ app/controllers/passengers_controller.rb | 7 ++++++ app/helpers/passengers_helper.rb | 2 ++ app/views/passengers/index.html.erb | 22 +++++++++++++++++++ config/routes.rb | 3 +++ .../controllers/passengers_controller_test.rb | 7 ++++++ 7 files changed, 46 insertions(+) create mode 100644 app/assets/javascripts/passengers.js create mode 100644 app/assets/stylesheets/passengers.scss create mode 100644 app/controllers/passengers_controller.rb create mode 100644 app/helpers/passengers_helper.rb create mode 100644 app/views/passengers/index.html.erb create mode 100644 test/controllers/passengers_controller_test.rb diff --git a/app/assets/javascripts/passengers.js b/app/assets/javascripts/passengers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/passengers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss new file mode 100644 index 000000000..0e27942f7 --- /dev/null +++ b/app/assets/stylesheets/passengers.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Passengers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb new file mode 100644 index 000000000..728f526ff --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,7 @@ +class PassengersController < ApplicationController + def index + @passengers = Passenger.all + end + + +end diff --git a/app/helpers/passengers_helper.rb b/app/helpers/passengers_helper.rb new file mode 100644 index 000000000..1af9e68f1 --- /dev/null +++ b/app/helpers/passengers_helper.rb @@ -0,0 +1,2 @@ +module PassengersHelper +end diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..031fc675a --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,22 @@ +
+ +

Rideshare Passengers

+ +
    + <% @passengers.each do |passenger| %> +
  • + <%= image_tag "http://placekitten.com/50/50", alt: "profile pic" %> +
    • +
  • + <%= link_to passenger.name, passenger_path(passenger.id) %> +
    • +
  • + <%= link_to "Edit", edit_passenger_path(passenger.id) %> +
    • +
  • + <%= link_to "Delete", passenger_path(passenger), method: :delete, data: {confirm: "Are you sure you want to delete the passenger #{passenger.name}?"} %> +
    • + <% end %> + +
+
diff --git a/config/routes.rb b/config/routes.rb index 787824f88..2a66935e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :passengers + end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb new file mode 100644 index 000000000..d57028e30 --- /dev/null +++ b/test/controllers/passengers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe PassengersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From e7decdd606c2f99683cfb7f4153b67de80165fb1 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 15:39:55 -0700 Subject: [PATCH 05/67] adds show action and view --- app/controllers/passengers_controller.rb | 11 ++++++++++ app/views/passengers/show.html.erb | 28 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 app/views/passengers/show.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 728f526ff..c87e68f3b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -3,5 +3,16 @@ def index @passengers = Passenger.all end + def show + @passenger = Passenger.find_by(id: params[:id]) + if @passenger.nil? + head :not_found + end + end + + def new + @passenger = Passenger.new + end + end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..6d89bdc24 --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,28 @@ +
+ +
+
    +
  • + <%= image_tag "http://placekitten.com/50/50", alt: "profile pic" %> +
    • +
  • + <%= @passenger.name %> +
    • +
  • + <%= @passenger.phone_num %> +
    • +
  • + PLACEHOLDER FOR TOTAL EARNINGS +
    • +
+
+ +
+ +

Passenger Trips

+ + + +
+ +
From 703cba89c0708097f12cdebebb3ed1b55152a6e0 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 15:48:41 -0700 Subject: [PATCH 06/67] adds new action and view --- app/views/passengers/new.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/views/passengers/new.html.erb diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..7da3652db --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @passenger, class: 'passenger-form' do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :phone_number %> + <%= f.text_field :phone_num%> + + <%= f.submit "Create", class: 'passenger-form-submit-button' %> + +<% end %> From 8946fe97f9e0e677d8331ce79c1181ddb1484aed Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:16:46 -0700 Subject: [PATCH 07/67] adds create action --- app/controllers/passengers_controller.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index c87e68f3b..435e7ef8b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -14,5 +14,25 @@ def new @passenger = Passenger.new end + def create + @passenger = Passenger.new(passenger_params) + + if @passenger.save + redirect_to passengers_path + else + render :new, status: :bad_request + end + end + + + + private + + def passenger_params + return params.require(:passenger).permit( + :name, + :phone_num + ) + end end From 238f4b8f978a8a9adbbe39f4bca9c40030b7eadc Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:23:14 -0700 Subject: [PATCH 08/67] adds create action and updates views with addition of partial view --- app/controllers/passengers_controller.rb | 4 ++++ app/views/passengers/_passenger_form.html.erb | 11 +++++++++++ app/views/passengers/edit.html.erb | 1 + app/views/passengers/new.html.erb | 12 +----------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 app/views/passengers/_passenger_form.html.erb create mode 100644 app/views/passengers/edit.html.erb diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 435e7ef8b..85bc0664b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -24,6 +24,10 @@ def create end end + def edit + @passenger = Passenger.find_by(id: params[:id]) + end + private diff --git a/app/views/passengers/_passenger_form.html.erb b/app/views/passengers/_passenger_form.html.erb new file mode 100644 index 000000000..65417c13e --- /dev/null +++ b/app/views/passengers/_passenger_form.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @passenger, class: 'passenger-form' do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :phone_number %> + <%= f.text_field :phone_num%> + + <%= f.submit action_type, class: 'passenger-form-submit-button' %> + +<% end %> diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..3606fee50 --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "passenger_form", locals: { action_type: "Edit Passenger"} %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 7da3652db..8de31c553 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,11 +1 @@ -<%= form_with model: @passenger, class: 'passenger-form' do |f| %> - - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :phone_number %> - <%= f.text_field :phone_num%> - - <%= f.submit "Create", class: 'passenger-form-submit-button' %> - -<% end %> +<%= render partial: "passenger_form", locals: { action_type: "Create Passenger"} %> From 130e9bc622179e0b7c62b3eb1ff247c5efcb3024 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:26:13 -0700 Subject: [PATCH 09/67] adds update action --- app/controllers/passengers_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 85bc0664b..6b141ff10 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -28,6 +28,16 @@ def edit @passenger = Passenger.find_by(id: params[:id]) end + def update + passenger = Passenger.find(params[:id]) + + if passenger.update(passenger_params) + redirect_to passenger_path(passenger.id) + else + render :edit, status: :bad_request + end + end + private From d5871b6f06e6d1ed5fc4df149040b503571645d2 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:29:18 -0700 Subject: [PATCH 10/67] adds passenger destroy action --- app/controllers/passengers_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 6b141ff10..4f1e407ac 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -38,6 +38,16 @@ def update end end + def destroy + passenger = Passenger.find_by(id: params[:id]) + + if passenger.destroy + redirect_to passengers_path + else + render :index, status: :bad_request + end + end + private From a6efcc192c0ae92494c0a8a86fed1c2a4e2d6a9d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:49:17 -0700 Subject: [PATCH 11/67] adds driver controller --- app/assets/javascripts/drivers.js | 2 ++ app/assets/stylesheets/drivers.scss | 3 +++ app/controllers/drivers_controller.rb | 2 ++ app/helpers/drivers_helper.rb | 2 ++ config/routes.rb | 2 ++ test/controllers/drivers_controller_test.rb | 7 +++++++ 6 files changed, 18 insertions(+) create mode 100644 app/assets/javascripts/drivers.js create mode 100644 app/assets/stylesheets/drivers.scss create mode 100644 app/controllers/drivers_controller.rb create mode 100644 app/helpers/drivers_helper.rb create mode 100644 test/controllers/drivers_controller_test.rb diff --git a/app/assets/javascripts/drivers.js b/app/assets/javascripts/drivers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/drivers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss new file mode 100644 index 000000000..8c1768a14 --- /dev/null +++ b/app/assets/stylesheets/drivers.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Drivers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..951cb9876 --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,2 @@ +class DriversController < ApplicationController +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/config/routes.rb b/config/routes.rb index 2a66935e6..2bb6ce6ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,6 @@ resources :passengers + resources :drivers + end diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb new file mode 100644 index 000000000..3ba908d00 --- /dev/null +++ b/test/controllers/drivers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe DriversController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From a9c85b460f545e91e8dbb8520e15ef5406d96401 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 16:54:18 -0700 Subject: [PATCH 12/67] adds driver index and view --- app/controllers/drivers_controller.rb | 17 +++++++++++++++++ app/views/drivers/index.html.erb | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 app/views/drivers/index.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 951cb9876..f32b7fd1d 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -1,2 +1,19 @@ class DriversController < ApplicationController + + def index + @drivers = Driver.all + end + + + + private + + def driver_params + return params.require(:driver).permit( + :name, + :phone_num + ) + end + + end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..b9710c3e5 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,25 @@ +
+ +

Rideshare Drivers

+ +
    + <% @drivers.each do |driver| %> +
  • + <%= image_tag "http://placekitten.com/50/50", alt: "profile pic" %> +
    • +
  • + <%= link_to driver.name, driver_path(driver.id) %> +
    • +
  • + RATING HERE!! +
    • +
  • + <%= link_to "Edit", edit_driver_path(driver.id) %> +
    • +
  • + <%= link_to "Delete", driver_path(driver), method: :delete, data: {confirm: "Are you sure you want to delete the driver #{driver.name}?"} %> +
    • + <% end %> + +
+
From e7763b604861fce997dfa193eb179b958a3eaf33 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:03:14 -0700 Subject: [PATCH 13/67] adds driver new action and view --- app/controllers/drivers_controller.rb | 6 ++++-- app/views/drivers/new.html.erb | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 app/views/drivers/new.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index f32b7fd1d..93c12b609 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -4,14 +4,16 @@ def index @drivers = Driver.all end - + def new + @driver = Driver.new + end private def driver_params return params.require(:driver).permit( :name, - :phone_num + :vin ) end diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..7b60f3e05 --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @driver, class: 'driver-form' do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :vin %> + <%= f.text_field :vin%> + + <%= f.submit "Create Driver", class: 'driver-form-submit-button' %> + +<% end %> From a501388666ef93fccd5daeae1f1b0f599ebaf424 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:13:31 -0700 Subject: [PATCH 14/67] adds driver show action and view --- app/controllers/drivers_controller.rb | 7 ++++++ app/views/drivers/show.html.erb | 31 +++++++++++++++++++++++++++ app/views/passengers/show.html.erb | 2 +- 3 files changed, 39 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 93c12b609..65731bd44 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -4,6 +4,13 @@ def index @drivers = Driver.all end + def show + @driver = Driver.find_by(id: params[:id]) + if @driver.nil? + head :not_found + end + end + def new @driver = Driver.new end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..c9dde81f3 --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,31 @@ +
+ +
+
    +
  • + <%= image_tag "http://placekitten.com/50/50", alt: "profile pic" %> +
    • +
  • + <%= @driver.name %> +
    • +
  • + <%= @driver.vin %> +
    • +
  • + PLACEHOLDER FOR TOTAL EARNINGS +
    • +
  • + PLACEHOLDER FOR AVG RATING +
    • +
+
+ +
+ +

Driver Trips

+ + + +
+ +
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 6d89bdc24..5f88cc2e0 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -12,7 +12,7 @@ <%= @passenger.phone_num %>
  • - PLACEHOLDER FOR TOTAL EARNINGS + PLACEHOLDER FOR TOTAL SPENT
    • From d76df5ec4441fc858e58a194268641faa0053311 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:16:42 -0700 Subject: [PATCH 15/67] adds driver create action --- app/controllers/drivers_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 65731bd44..44ce3bfa6 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -15,6 +15,16 @@ def new @driver = Driver.new end + def create + @driver = Driver.new(driver_params) + + if @driver.save + redirect_to drivers_path + else + render :new, status: :bad_request + end + end + private def driver_params From a874c639bd50042b3e597250ff0f5e71c432da9d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:20:57 -0700 Subject: [PATCH 16/67] adds driver edit action and updates views with partial --- app/controllers/drivers_controller.rb | 4 ++++ app/views/drivers/_driver_form.html.erb | 11 +++++++++++ app/views/drivers/edit.html.erb | 1 + app/views/drivers/new.html.erb | 12 +----------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 app/views/drivers/_driver_form.html.erb create mode 100644 app/views/drivers/edit.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 44ce3bfa6..2f9b4f9fb 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -25,6 +25,10 @@ def create end end + def edit + @driver = Driver.find_by(id: params[:id]) + end + private def driver_params diff --git a/app/views/drivers/_driver_form.html.erb b/app/views/drivers/_driver_form.html.erb new file mode 100644 index 000000000..94c49ee75 --- /dev/null +++ b/app/views/drivers/_driver_form.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @driver, class: 'driver-form' do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :vin %> + <%= f.text_field :vin%> + + <%= f.submit action_type, class: 'driver-form-submit-button' %> + +<% end %> diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..9e00953e4 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "driver_form", locals: { action_type: "Edit Driver"} %> diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 7b60f3e05..a0cc95fcd 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1,11 +1 @@ -<%= form_with model: @driver, class: 'driver-form' do |f| %> - - <%= f.label :name %> - <%= f.text_field :name %> - - <%= f.label :vin %> - <%= f.text_field :vin%> - - <%= f.submit "Create Driver", class: 'driver-form-submit-button' %> - -<% end %> +<%= render partial: "driver_form", locals: { action_type: "Create Driver"} %> From ee52ffb125556fe2ca42e7a48facf4a8cbef4fef Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:22:07 -0700 Subject: [PATCH 17/67] adds driver update action --- app/controllers/drivers_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 2f9b4f9fb..cf991e91c 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -29,6 +29,16 @@ def edit @driver = Driver.find_by(id: params[:id]) end + def update + driver = Driver.find(params[:id]) + + if driver.update(driver_params) + redirect_to driver_path(driver.id) + else + render :edit, status: :bad_request + end + end + private def driver_params From c68514289ff327d043557ae83fc6e61e9f006c94 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Tue, 2 Oct 2018 17:23:28 -0700 Subject: [PATCH 18/67] adds driver destroy action: --- app/controllers/drivers_controller.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index cf991e91c..43853d468 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -39,6 +39,16 @@ def update end end + def destroy + driver = Driver.find_by(id: params[:id]) + + if driver.destroy + redirect_to drivers_path + else + render :index, status: :bad_request + end + end + private def driver_params From 52ee0c62fe11ab05026a5cc8cb973fc3fad62d4f Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 15:08:38 -0700 Subject: [PATCH 19/67] adds error validations to the driver and passenger models --- app/models/driver.rb | 2 ++ app/models/passenger.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/driver.rb b/app/models/driver.rb index 1ff364562..854556db9 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,2 +1,4 @@ class Driver < ApplicationRecord + validates :name, presence: true + validates :vin, presence: true end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2c5748ac2..f8cc4fe03 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,2 +1,4 @@ class Passenger < ApplicationRecord + validates :name, presence: true + validates :phone_num, presence: true end From cb2afc3aba552db98996ccab839db15ffb4a1332 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 15:33:44 -0700 Subject: [PATCH 20/67] adds error html to partial views --- app/controllers/drivers_controller.rb | 4 ++-- app/controllers/passengers_controller.rb | 4 ++-- app/views/drivers/_driver_form.html.erb | 2 ++ app/views/layouts/_form_errors.html.erb | 15 +++++++++++++++ app/views/passengers/_passenger_form.html.erb | 2 ++ config/initializers/action_view.rb | 3 +++ 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 app/views/layouts/_form_errors.html.erb create mode 100644 config/initializers/action_view.rb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 43853d468..5b876e306 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -30,9 +30,9 @@ def edit end def update - driver = Driver.find(params[:id]) + @driver = Driver.find(params[:id]) - if driver.update(driver_params) + if @driver.update(driver_params) redirect_to driver_path(driver.id) else render :edit, status: :bad_request diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 4f1e407ac..26c285230 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -29,9 +29,9 @@ def edit end def update - passenger = Passenger.find(params[:id]) + @passenger = Passenger.find(params[:id]) - if passenger.update(passenger_params) + if @passenger.update(passenger_params) redirect_to passenger_path(passenger.id) else render :edit, status: :bad_request diff --git a/app/views/drivers/_driver_form.html.erb b/app/views/drivers/_driver_form.html.erb index 94c49ee75..57d78d469 100644 --- a/app/views/drivers/_driver_form.html.erb +++ b/app/views/drivers/_driver_form.html.erb @@ -1,3 +1,5 @@ +<%= render partial: 'layouts/form_errors', locals: { model: @driver } %> + <%= form_with model: @driver, class: 'driver-form' do |f| %> <%= f.label :name %> diff --git a/app/views/layouts/_form_errors.html.erb b/app/views/layouts/_form_errors.html.erb new file mode 100644 index 000000000..e20749261 --- /dev/null +++ b/app/views/layouts/_form_errors.html.erb @@ -0,0 +1,15 @@ +<% if model.errors.messages.any? %> +
    +

    There were some problems. Please fix them before submitting update.

    +
      + <% model.errors.messages.each do |field, problem_list| %> + <% problem_list.each do |problem| %> +
    • + <%= field %> + <%= problem %> +
      • + <% end %> + <% end %> +
    +
    +<% end %> diff --git a/app/views/passengers/_passenger_form.html.erb b/app/views/passengers/_passenger_form.html.erb index 65417c13e..ec86e16bc 100644 --- a/app/views/passengers/_passenger_form.html.erb +++ b/app/views/passengers/_passenger_form.html.erb @@ -1,3 +1,5 @@ +<%= render partial: 'layouts/form_errors', locals: { model: @passenger } %> + <%= form_with model: @passenger, class: 'passenger-form' do |f| %> <%= f.label :name %> diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..b3fba4092 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1,3 @@ +# Make form_with behave reasonably +# https://stackoverflow.com/questions/47822826/set-local-true-as-default-for-form-with-in-rails-5/51666415#51666415 +Rails.application.config.action_view.form_with_generates_remote_forms = false From 43641a21b8ded65199a2b911fc1101f1632fca9c Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Wed, 3 Oct 2018 15:47:06 -0700 Subject: [PATCH 21/67] generate trips controller --- app/assets/javascripts/trips.js | 2 + app/assets/stylesheets/trips.scss | 3 ++ app/controllers/trips_controller.rb | 53 +++++++++++++++++++++++ app/helpers/trips_helper.rb | 2 + app/views/trips/index.html.erb | 2 + app/views/trips/show.html.erb | 2 + config/routes.rb | 4 +- test/controllers/trips_controller_test.rb | 34 +++++++++++++++ 8 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/trips.js create mode 100644 app/assets/stylesheets/trips.scss create mode 100644 app/controllers/trips_controller.rb create mode 100644 app/helpers/trips_helper.rb create mode 100644 app/views/trips/index.html.erb create mode 100644 app/views/trips/show.html.erb create mode 100644 test/controllers/trips_controller_test.rb diff --git a/app/assets/javascripts/trips.js b/app/assets/javascripts/trips.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/trips.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss new file mode 100644 index 000000000..473cbc303 --- /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..05b4e6ecf --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,53 @@ +class TripsController < ApplicationController + + def show + @trip = Trip.find_by(id: params[:id]) + if @trip.nil? + head :not_found + end + end + + def new + @trip = Trip.new + end + + def create + @trip = Trip.new(trip_params) + + if @trip.save + redirect_to trips_path + else + render :new, status: :bad_request + end + end + + def update + trip = Trip.find(params[:id]) + + if trip.update(trip_params) + redirect_to trip_path(trip.id) + else + render :edit, status: :bad_request + end + end + + def destroy + trip = Trip.find_by(id: params[:id]) + + if trip.destroy + redirect_to trips_path + else + render :index, status: :bad_request + end + end + + private + + def trip_params + return params.require(:trip).permit( + :rating + ) + end + + +end diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb new file mode 100644 index 000000000..04f333d46 --- /dev/null +++ b/app/helpers/trips_helper.rb @@ -0,0 +1,2 @@ +module TripsHelper +end diff --git a/app/views/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/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..fb24fc2fe --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,2 @@ +

    Trips#show

    +

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

    diff --git a/config/routes.rb b/config/routes.rb index 2bb6ce6ae..c75e94304 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - resources :passengers + resources :passengers, :drivers - resources :drivers + resources :trips, except: [:index, :edit] end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb new file mode 100644 index 000000000..3244e5bcf --- /dev/null +++ b/test/controllers/trips_controller_test.rb @@ -0,0 +1,34 @@ +require "test_helper" + +describe TripsController do + it "should get new" do + get trips_new_url + value(response).must_be :success? + end + + it "should get create" do + get trips_create_url + value(response).must_be :success? + end + + it "should get update" do + get trips_update_url + value(response).must_be :success? + end + + it "should get edestroy" do + get trips_edestroy_url + value(response).must_be :success? + end + + it "should get index" do + get trips_index_url + value(response).must_be :success? + end + + it "should get show" do + get trips_show_url + value(response).must_be :success? + end + +end From 56946110d650713913a416d70503007944b45ee1 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 16:48:38 -0700 Subject: [PATCH 22/67] adds relations to passenger, trip, driver models and modifies passenger show template to display trips --- app/models/driver.rb | 1 + app/models/passenger.rb | 1 + app/models/trip.rb | 2 ++ app/views/passengers/show.html.erb | 23 ++++++++++++++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 1ff364562..197e65507 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,2 +1,3 @@ class Driver < ApplicationRecord + has_many :trips end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2c5748ac2..2fef89192 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,2 +1,3 @@ class Passenger < ApplicationRecord + has_many :trips end diff --git a/app/models/trip.rb b/app/models/trip.rb index a8c077a10..8e2566cd8 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,2 +1,4 @@ class Trip < ApplicationRecord + belongs_to :driver + belongs_to :passenger end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 5f88cc2e0..60932c80e 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -21,7 +21,28 @@

    Passenger Trips

    - +
      +
    • ID
      • +
    • Date
      • +
    • Driver
      • +
    • Passenger
      • +
    • Price
      • +
    • Rating
      • +
    • Delete
      • +
    + + <% @passenger.trips.each do |trip| %> +
      +
    • <%=trip.id%>
      • +
    • <%=trip.date%>
      • +
    • Driver: <%=trip.driver.name%>
      • +
    • Passenger: <%=@passenger.name%>
      • +
    • <%=trip.cost%>
      • +
    • <%=trip.rating%>
      • +
    • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
      • +
    + <% end %> + From 8a0d7190581e06f7bc266aa45acb34b0b558c10d Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 17:45:47 -0700 Subject: [PATCH 23/67] adds driver link on trips list --- app/views/drivers/show.html.erb | 23 ++++++++++++++++++++++- app/views/passengers/show.html.erb | 4 ++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index c9dde81f3..c37f5b9be 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -24,7 +24,28 @@

    Driver Trips

    - +
      +
    • ID
      • +
    • Date
      • +
    • Driver
      • +
    • Passenger
      • +
    • Price
      • +
    • Rating
      • +
    • Delete
      • +
    + + <% @driver.trips.each do |trip| %> +
      +
    • <%=trip.id%>
      • +
    • <%=trip.date%>
      • +
    • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
      • + +
    • Passenger: <%=trip.passenger.name%>
      • +
    • <%=trip.cost%>
      • +
    • <%=trip.rating%>
      • +
    • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
      • +
    + <% end %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 60932c80e..de266f6ef 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -35,8 +35,8 @@
    • <%=trip.id%>
    • <%=trip.date%>
      • -
    • Driver: <%=trip.driver.name%>
      • -
    • Passenger: <%=@passenger.name%>
      • +
    • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
      • +
    • Passenger: <%=trip.passenger.name%>
    • <%=trip.cost%>
    • <%=trip.rating%>
    • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
      • From 1cd051bb8b70f0afb97b2b35af88a6c0e93c34f6 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 17:47:00 -0700 Subject: [PATCH 24/67] adds passenger link on trips list --- app/views/drivers/show.html.erb | 3 +-- app/views/passengers/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index c37f5b9be..66cc34ee6 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -39,8 +39,7 @@
    • <%=trip.id%>
    • <%=trip.date%>
    • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
      • - -
    • Passenger: <%=trip.passenger.name%>
      • +
    • Passenger: <%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
    • <%=trip.cost%>
    • <%=trip.rating%>
    • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
      • diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index de266f6ef..5d9a294ac 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -36,7 +36,7 @@
    • <%=trip.id%>
    • <%=trip.date%>
    • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
      • -
    • Passenger: <%=trip.passenger.name%>
      • +
    • Passenger: <<%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
    • <%=trip.cost%>
    • <%=trip.rating%>
    • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
      • From ce830cb94b029eff55d7b2a597e69a8f996a8dea Mon Sep 17 00:00:00 2001 From: Anibel America Date: Wed, 3 Oct 2018 18:03:42 -0700 Subject: [PATCH 25/67] adds trip details pages --- app/views/drivers/show.html.erb | 2 +- app/views/passengers/show.html.erb | 4 ++-- app/views/trips/show.html.erb | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 66cc34ee6..acbaf622a 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -36,7 +36,7 @@ <% @driver.trips.each do |trip| %>
        -
      • <%=trip.id%>
        • +
      • <%= link_to trip.id, trip_path(trip.id) %>
      • <%=trip.date%>
      • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
      • Passenger: <%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
        • diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 5d9a294ac..384e49091 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -33,10 +33,10 @@ <% @passenger.trips.each do |trip| %>
          -
        • <%=trip.id%>
          • +
        • <%= link_to trip.id, trip_path(trip.id) %>
        • <%=trip.date%>
        • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
          • -
        • Passenger: <<%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
          • +
        • Passenger: <%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
        • <%=trip.cost%>
        • <%=trip.rating%>
        • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
          • diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index fb24fc2fe..4afb2d2b4 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,2 +1,30 @@

          Trips#show

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

          + +
          + +

          Trip #<%= @trip.id %>

          + +
          + +
            +
          • ID
            • +
          • Date
            • +
          • Driver
            • +
          • Passenger
            • +
          • Price
            • +
          • Rating
            • +
          • Delete
            • +
          + +
            <% trip = @trip %> +
          • <%=@trip.id%>
            • +
          • <%=@trip.date%>
            • +
          • Driver: <%= link_to @trip.driver.name, driver_path(@trip.driver.id) %>
            • +
          • Passenger: <%= link_to @trip.passenger.name, passenger_path(@trip.passenger.id) %>
            • +
          • <%=@trip.cost%>
            • +
          • <%=@trip.rating%>
            • +
          • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
            • +
          + +
          From 62b83d7ef158d30565057c2e2ccedd3b31f8e3a9 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Thu, 4 Oct 2018 12:11:32 -0700 Subject: [PATCH 26/67] generate pages controller --- app/assets/javascripts/pages.js | 2 ++ app/assets/stylesheets/pages.scss | 3 +++ app/controllers/pages_controller.rb | 5 +++++ app/helpers/pages_helper.rb | 2 ++ app/views/layouts/application.html.erb | 2 +- app/views/pages/home.html.erb | 0 test/controllers/pages_controller_test.rb | 7 +++++++ 7 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/pages.js create mode 100644 app/assets/stylesheets/pages.scss create mode 100644 app/controllers/pages_controller.rb create mode 100644 app/helpers/pages_helper.rb create mode 100644 app/views/pages/home.html.erb create mode 100644 test/controllers/pages_controller_test.rb diff --git a/app/assets/javascripts/pages.js b/app/assets/javascripts/pages.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/pages.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/pages.scss b/app/assets/stylesheets/pages.scss new file mode 100644 index 000000000..0d6878aa1 --- /dev/null +++ b/app/assets/stylesheets/pages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pages 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/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 000000000..051799f28 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,5 @@ +class PagesController < ApplicationController + def show + render "pages/#{params[:page]}" + end +end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb new file mode 100644 index 000000000..2c057fd05 --- /dev/null +++ b/app/helpers/pages_helper.rb @@ -0,0 +1,2 @@ +module PagesHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 692ca547e..20c8c5d52 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - RideShareRails + Rideshare on Rails <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb new file mode 100644 index 000000000..c9a686b8f --- /dev/null +++ b/test/controllers/pages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe PagesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 0e545b2b2b8f02a0e9698e34bf6ea2c2ebd528b4 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Thu, 4 Oct 2018 12:30:44 -0700 Subject: [PATCH 27/67] add pagescontroller route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 2bb6ce6ae..388292d29 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,5 @@ resources :drivers + resources :pages, only: [:show] end From c76ae16a9e11975d9aa17b43a2da579f90fa985c Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Thu, 4 Oct 2018 12:33:08 -0700 Subject: [PATCH 28/67] set root route --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 388292d29..7bb4f8fea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root "pages#show", page: "home" resources :passengers From 4b3bb4f31424cc58e81ba5c4287d0270f89d1de0 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 4 Oct 2018 12:34:43 -0700 Subject: [PATCH 29/67] adds method and view for driver's total earnings --- app/models/driver.rb | 7 +++++++ app/views/drivers/show.html.erb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 35ac9841c..7ff5c9b05 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,5 +1,12 @@ class Driver < ApplicationRecord validates :name, presence: true validates :vin, presence: true + has_many :trips + + def total_earnings + return self.trips.sum { |trip| (trip.cost - 1.65) * 0.80 / 100}.round(2) + end + + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index acbaf622a..c3f9a63fb 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -12,7 +12,7 @@ <%= @driver.vin %>
        • - PLACEHOLDER FOR TOTAL EARNINGS + Total Earnings: $<%= @driver.total_earnings%>
        • PLACEHOLDER FOR AVG RATING From 88d5016d041305be881120fc3cfb17ba3e1f1a2b Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 4 Oct 2018 12:43:58 -0700 Subject: [PATCH 30/67] adds driver average rating --- app/models/driver.rb | 4 ++++ app/views/drivers/show.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 7ff5c9b05..ebd2ad1e6 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -8,5 +8,9 @@ def total_earnings return self.trips.sum { |trip| (trip.cost - 1.65) * 0.80 / 100}.round(2) end + def average_rating + return (self.trips.sum { |trip| trip.rating} * 1.0 / self.trips.length).round(1) + end + end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index c3f9a63fb..6fccfd5ac 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -15,7 +15,7 @@ Total Earnings: $<%= @driver.total_earnings%>
        • - PLACEHOLDER FOR AVG RATING + Average Rating: <%= @driver.average_rating%>
        From a542e77e2b1daf8d5e51b00df05a7482fa0ddcd5 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 4 Oct 2018 13:02:46 -0700 Subject: [PATCH 31/67] adds edit/delete button to passenger and driver detail page --- app/views/drivers/show.html.erb | 6 ++++++ app/views/passengers/show.html.erb | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 6fccfd5ac..8acff9f0c 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -17,6 +17,12 @@
      • Average Rating: <%= @driver.average_rating%>
        • +
      • + <%= link_to "Edit", edit_driver_path(@driver) %> +
        • +
      • + <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure you want to delete the driver #{@driver.name}?"} %> +
      diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 384e49091..cebdbbd1d 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -14,6 +14,12 @@
    • PLACEHOLDER FOR TOTAL SPENT
      • +
    • + <%= link_to "Edit", edit_passenger_path(@passenger) %> +
      • +
    • + <%= link_to "Delete", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure you want to delete the passenger #{@passenger.name}?"} %> +
    From 950154cd95da17b1830b469244f2ce1bd998e424 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 4 Oct 2018 13:14:05 -0700 Subject: [PATCH 32/67] adds total charged to pasenger details page --- app/models/passenger.rb | 4 ++++ app/views/drivers/show.html.erb | 2 +- app/views/passengers/show.html.erb | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models/passenger.rb b/app/models/passenger.rb index d28b336dd..8e809a082 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -2,4 +2,8 @@ class Passenger < ApplicationRecord validates :name, presence: true validates :phone_num, presence: true has_many :trips + + def amt_charged + return self.trips.sum { |trip| trip.cost } * 1.0 / 100 + end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 8acff9f0c..444b95947 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -46,7 +46,7 @@
  • <%=trip.date%>
  • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
  • Passenger: <%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
    • -
  • <%=trip.cost%>
    • +
  • $<%=trip.cost%>
  • <%=trip.rating%>
  • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
    • diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index cebdbbd1d..4cdd1b3c3 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -12,7 +12,7 @@ <%= @passenger.phone_num %>
  • - PLACEHOLDER FOR TOTAL SPENT + Total Spent: $<%= @passenger.amt_charged %>
  • <%= link_to "Edit", edit_passenger_path(@passenger) %> @@ -43,7 +43,7 @@
  • <%=trip.date%>
  • Driver: <%= link_to trip.driver.name, driver_path(trip.driver.id) %>
  • Passenger: <%= link_to trip.passenger.name, passenger_path(trip.passenger.id) %>
    • -
  • <%=trip.cost%>
    • +
  • $<%=trip.cost%>
  • <%=trip.rating%>
  • <%= button_to "Delete", trip_path(trip), method: :delete, data: {confirm: "Are you sure you want to delete Trip #{trip.id}?"} %>
    • From 3b3761550b0a8dacbabfffc2740a2c7ac6e497c3 Mon Sep 17 00:00:00 2001 From: Anibel America Date: Thu, 4 Oct 2018 13:17:37 -0700 Subject: [PATCH 33/67] adds average rating to driver index page --- 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 b9710c3e5..8b9e4b575 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -11,7 +11,7 @@ <%= link_to driver.name, driver_path(driver.id) %>
  • - RATING HERE!! + Avg Rating: <%= driver.average_rating %>
  • <%= link_to "Edit", edit_driver_path(driver.id) %> From acb9c1355e856a06ef761f79d04905c600726a20 Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Thu, 4 Oct 2018 13:20:39 -0700 Subject: [PATCH 34/67] begin html/css for master layout --- app/assets/images/logo4.png | Bin 0 -> 6609 bytes app/views/layouts/application.html.erb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 app/assets/images/logo4.png diff --git a/app/assets/images/logo4.png b/app/assets/images/logo4.png new file mode 100644 index 0000000000000000000000000000000000000000..61952f5c0a2b79e7842a35e1bd5d02692f1fc354 GIT binary patch literal 6609 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 Z72)ty$?-XERq$60L`TB_S*_*}`#-tAiRl0U literal 0 HcmV?d00001 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 20c8c5d52..601b146c8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,29 @@ +
    + +
    <%= yield %> From ec57f6da8026c79139adc65cadf5d32a3929ec1b Mon Sep 17 00:00:00 2001 From: Hayden Williams Date: Thu, 4 Oct 2018 13:28:02 -0700 Subject: [PATCH 35/67] Pages css --- app/assets/stylesheets/pages.scss | 13 +++++++++++++ app/views/layouts/application.html.erb | 14 +++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index 0d6878aa1..20f1ff2cc 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -1,3 +1,16 @@ // Place all the styles related to the pages controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +.dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + padding: 12px 16px; + z-index: 1; +} + +.nav-links:hover .dropdown-content { + display: block; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 601b146c8..b2fc6bfe7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -14,20 +14,24 @@