diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..fcdcf67ee Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..0d4de7eb0 --- /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 \ No newline at end of file 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..9b3b6ef05 --- /dev/null +++ b/Gemfile @@ -0,0 +1,83 @@ +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.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'minitest-skip' +end + +gem 'will_paginate', '~> 3.1.6' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..4179d1284 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,276 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.7.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.3) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + capybara (3.16.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.0) + 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.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.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.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) + msgpack (1.2.9) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.4.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.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.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.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.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + 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) + will_paginate (3.1.7) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-skip + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + 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) + will_paginate (~> 3.1.6) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 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..39424d214 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,154 @@ +/* + * 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 + */ + + body{ + margin: 0px 0px 20px 0px; + font-family: Arial, Helvetica, sans-serif; + } + +.logo{ + color: white; + line-height: 40px; + font-size: 2rem; + display:inline; + font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + padding-right: 15%; + padding-left: 4px; +} + +.logo a { + text-decoration: none; + color: white; +} + +.logo a:hover { + text-decoration: underline; +} + +.head-container{ + background-color: rgb(117, 53, 155); +} + +footer { + text-align: center; + padding-top: 30px; + padding-bottom: 20px; +} + +.nav-container{ + padding-left: 0px; + margin-bottom: 0px; + list-style: none; + display: inline-flex; + +} + +.nav-container ul li{ + display: inline; + list-style-type: none; + padding: 10px 30px; + font-family: Arial, Helvetica, sans-serif; +} + +.nav-container ul li a{ + color: bisque; + text-decoration: none; + +} + +.nav-container ul li a:hover { + color: rgb(252, 191, 117); + text-decoration: none; +} + + +.user-heading{ + font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; +} + +/* TABLES */ + +.show-table, tr { + border: 2px solid rgb(117, 53, 155); +} + +.show-table tr:nth-child(even) { + background-color: rgba(118, 53, 155, 0.151); + color: black; +} + +.show-table td { + padding: 10px; +} + +.show-table th { + padding: 10px; +} + +.show-table { + margin: 20px; +} + +.show-table a, .lower-links a, .request-rate a, .show-all-list li a { + text-decoration: none; + color: black; +} + +.show-table a:hover, .lower-links a:hover, .request-rate a:hover, .show-all-list li a:hover { + text-decoration: underline; + color: rgb(117, 53, 155); +} + +/* SHOW PAGES */ + +.lower-links a { + padding: 20px; + border: 1px solid rgb(117, 53, 155); + +} + +.lower-links { + padding: 20px; +} + +.profile-pics, .charges, .stats, .name, .request-rate { + padding-left: 20px; +} + +/* INDEX PAGES */ +.show-all-list li { + padding: 5px; +} + +/* HOMEPAGE */ +.homepage { + padding-left: 20px; + padding-bottom: 300px; +} + +/* FORMS */ + +.form { + border: 2px solid rgb(117, 53, 155); + padding: 20px; + margin-left: 20px; + width: 600px; + margin-bottom: 300px; +} + +.form-heading { + padding-left: 20px; +} 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/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..8dcfa999e --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,65 @@ +class DriversController < ApplicationController + def index + @drivers = Driver.paginate(:page => params[:page], :per_page => 10) + end + + def show + driver_id = params[:id] + @driver = Driver.find_by(id: driver_id) + + if @driver.nil? + redirect_to drivers_path + end + end + + def new + @driver = Driver.new + end + + def create + @driver = Driver.new(driver_params) + is_successful = @driver.save + + if is_successful + redirect_to drivers_path + else + render :new + end + end + + def edit + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + redirect_to drivers_path + end + end + + def update + driver = Driver.find(params[:id]) + is_successful = driver.update(driver_params) + if is_successful + redirect_to drivers_path + else + @driver = driver + render :edit + end + end + + def destroy + driver = Driver.find_by(id: params[:id]) + + if driver.nil? + head :not_found + else + driver.destroy + redirect_to drivers_path + end + end + + private + + def driver_params + return params.require(:driver).permit(:name, :vin) + end +end diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb new file mode 100644 index 000000000..e09cc6e59 --- /dev/null +++ b/app/controllers/homepage_controller.rb @@ -0,0 +1,4 @@ +class HomepageController < ApplicationController + def index + end +end diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 000000000..f200c8ac2 --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,4 @@ +class HomepagesController < ApplicationController + def index + end +end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb new file mode 100644 index 000000000..ff6115de3 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,65 @@ +class PassengersController < ApplicationController + def index + @passengers = Passenger.paginate(:page => params[:page], :per_page => 10) + end + + def show + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + redirect_to passengers_path + end + end + + def new + @passenger = Passenger.new + end + + def create + @passenger = Passenger.new(passenger_params) + is_successful = @passenger.save + + if is_successful + redirect_to passengers_path + else + render :new + end + end + + def edit + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + redirect_to drivers_path + end + end + + def update + passenger = Passenger.find(params[:id]) + is_successful = passenger.update(passenger_params) + + if is_successful + redirect_to passengers_path + else + @passenger = passenger + render :edit + end + end + + def destroy + passenger = Passenger.find_by(id: params[:id]) + + if passenger.nil? + head :not_found + else + passenger.destroy + redirect_to passengers_path + end + end + + private + + def passenger_params + return params.require(:passenger).permit(:name, :phone_number) + end +end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..d7b9bc80f --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,79 @@ + + +class TripsController < ApplicationController + def show + @trip = Trip.find_by(id: params[:id]) + if @trip.nil? + # unless !@trip.nil? + redirect_to trips_path + end + end + + def new + @trip = Trip.new + end + + def create + passenger = Passenger.find_by(id: params[:trip][:passenger_id]) + driver = Driver.find_by(status: true) + @trip = Trip.new( + passenger: passenger, + driver: driver, + date: Time.now.strftime("%Y-%d-%m"), + cost: rand(200..10000), + ) + + is_successful = @trip.save + + if is_successful + driver.status = false + driver.save + redirect_to passenger_path(@trip.passenger_id) + else + render :new + end + end + + def edit + @trip = Trip.find_by(id: params[:id]) + + redirect_to trips_path if @trip.nil? + end + + def update + trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + redirect_to trips_path + else + trip.update(trip_params) + redirect_to passenger_path(trip.passenger_id) + end + + # if is_successful + # redirect_to passenger_path(trip.passenger_id) + # else + # redirect_to trips_path + # end + + + + end + + def destroy + trip = Trip.find_by(id: params[:id]) + + if trip.nil? + head :not_found + else + trip.destroy + redirect_to trips_path + end + end + + private + + def trip_params + return params.require(:trip).permit(:cost, :date, :driver_id, :passenger_id, :rating) + end +end 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/models/driver.rb b/app/models/driver.rb new file mode 100644 index 000000000..caac9eade --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,18 @@ +class Driver < ApplicationRecord + has_many :trips + + validates :vin, presence: true, uniqueness: true + validates :name, presence: true + + def total_earnings + fee = 165 + percentage = 0.80 + total = (self.trips.sum { |trip| trip.cost - fee } * percentage) / 100 + return "$#{total.round(2)}" + end + + def average_rating + not_nil = self.trips.find_all { |trip| !trip.rating.nil? } + return 1.0 * not_nil.sum { |trip| trip.rating } / not_nil.length + end +end diff --git a/app/models/passenger.rb b/app/models/passenger.rb new file mode 100644 index 000000000..ff0e3008c --- /dev/null +++ b/app/models/passenger.rb @@ -0,0 +1,10 @@ +class Passenger < ApplicationRecord + has_many :trips + + validates :name, presence: true + validates :phone_number, presence: true + + def total_charges + return (self.trips.sum { |trip| trip.cost }) / 100 + end +end diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..8e2566cd8 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,4 @@ +class Trip < ApplicationRecord + belongs_to :driver + belongs_to :passenger +end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..5f3860be5 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,23 @@ +<% if @driver.errors.any? %> + +<% end %> + +
+ <%= form_with model: @driver, class: form_class do |f| %> + +

<%= intro_text %>

+ + <%= f.label :name %> + <%= f.text_field :name %> + <%= f.label :vin %> + <%= f.text_field :vin %> + + <%= f.submit action_name, class: "driver-form_save-button" %> + <% end %> +
\ No newline at end of file diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..dffb58834 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1,10 @@ +

Form for editing a driver

+ + +<%= render partial: "form", locals: { + form_class: "edit-driver", + intro_text: "Use this form to edit a new driver", + action_name: "Edit Driver" + } %> + +<%= link_to "Back to list of all driver", drivers_path %> \ No newline at end of file diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..43e540457 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,15 @@ +

All Drivers

+ +<%= will_paginate @drivers %> + + + +<%= link_to "Add new driver", new_driver_path %> diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..597ae4fc9 --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1,8 @@ +

Form for creating a new driver

+ + +<%= render partial: "form", locals: { + form_class: "new-driver", + intro_text: "Use this form to create a new driver", + action_name: "Create Driver" + } %> \ No newline at end of file diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..99a47905f --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,60 @@ +

<%= @driver.name%>

+ +
+ A kitty user +
+ +
+

<%= "Driver total earnings #{@driver.total_earnings}"%>

+

<%= "Driver average rating #{@driver.average_rating.round(2)}"%>

+
+ + + + + + + + + + +<% @driver.trips.each do |trip| %> + + + + + + + + + + + + + + + + + +<% end %> +
Trip IDTrip DatePassenger NamePriceRating
+ <%= link_to trip.id, passenger_trip_path(trip.passenger_id, trip.id) %> + + <%= trip.date %> + + <%= link_to Passenger.find(trip.passenger_id).name, passenger_path(trip.passenger_id) %> + + <%= trip.cost / 100 %> + + <%= trip.rating%> + + <%= link_to "Edit Trip", edit_trip_path(trip.id) %> + + <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure you want to delete this trip?"} %> +
+ +
+<%= link_to "Delete driver", driver_path(@driver.id), method: :delete, data: {confirm: "Are you sure you want to delete this driver? All associated trip data will also be deleted."}%> +<%= link_to "Edit driver", edit_driver_path(@driver.id) %> +<%= link_to "Back to list of all driver", drivers_path %> +
\ No newline at end of file diff --git a/app/views/homepage/index.html.erb b/app/views/homepage/index.html.erb new file mode 100644 index 000000000..afb8611b7 --- /dev/null +++ b/app/views/homepage/index.html.erb @@ -0,0 +1,5 @@ +
+

<%= "Welcome to Rideshare on Rails" %>

+

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

+

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

+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..0b1749e5c --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,36 @@ + + + + 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' %> + + +
+

<%= link_to "Marganie RideShare", homepage_index_path %>

+ +
+ + + + + + +
+ <%= 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/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..1d934a03b --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,23 @@ +<% if @passenger.errors.any? %> + +<% end %> + +
+ <%= form_with model: @passenger, class: form_class do |f| %> + +

<%= intro_text %>

+ + <%= f.label :name %> + <%= f.text_field :name %> + <%= f.label :phone_number %> + <%= f.text_field :phone_number %> + + <%= f.submit action_name, class: "passenger-form_save-button" %> + <% end %> +
\ No newline at end of file diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..615e5f3b3 --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1,10 @@ +

Form for editing a passenger

+ + +<%= render partial: "form", locals: { + form_class: "edit-passenger", + intro_text: "Use this form to edit a new passenger", + action_name: "Edit Passenger" + } %> + +<%= link_to "Back to list of all passengers", passengers_path %> \ No newline at end of file diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..5f5a34194 --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,15 @@ +

All Passengers

+ +<%= will_paginate @passengers %> + + + +<%= link_to "Add new passenger", new_passenger_path %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..3f8497af4 --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1,8 @@ +

Form for creating a new passenger

+ + +<%= render partial: "form", locals: { + form_class: "new-passenger", + intro_text: "Use this form to create a new passenger", + action_name: "Create Passenger" + } %> \ No newline at end of file diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..22b6a5c6f --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,72 @@ +

<%= @passenger.name%>

+ +
+ A kitty user +
+ +
+<% nil_trips = @passenger.trips.where(rating: nil) %> +<% if nil_trips.length > 0 %> + <%= form_with model: nil_trips.first, class: "rating" do |f| %> + + <%= f.label :rating %> + <%= f.text_field :rating %> + + <%= f.submit "Submit Rating", class: "rating-save-button" %> + + <% end %> + +<% else %> + <%= link_to "Request Ride", passenger_trips_path(@passenger.id), method: :post %> +<% end %> +
+ +

<%= "Passenger total charges $#{@passenger.total_charges}" %>

+ + + + + + + + + +<% @passenger.trips.each do |trip| %> + + + + + + + + + + + + + + + + +<% end %> +
Trip IDTrip DateDriver NamePriceRating
+ <%= link_to trip.id, passenger_trip_path(@passenger.id, trip.id) %> + + <%= trip.date %> + + <%= link_to Driver.find(trip.driver_id).name, driver_path(trip.driver_id) %> + + <%= "$#{trip.cost / 100}" %> + + <%= trip.rating %> + + <%= link_to "Edit Trip", edit_trip_path(trip.id) %> + + <%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure you want to delete this trip?"} %> +
+ +
+<%= link_to "Delete Passenger", passenger_path(@passenger.id), method: :delete, data: {confirm: "Are you sure you want to delete this passenger? All associated trip data will also be deleted."} %> +<%= link_to "Edit passenger", edit_passenger_path(@passenger.id) %> +<%= link_to "Back to list of all passengers", passengers_path %> +
\ No newline at end of file diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..cfa362a95 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,24 @@ +<% if @trip.errors.any? %> + +<% end %> + + +<%= form_with model: @trip, class: "edit-trip" do |f| %> +

<%= "Use this form to edit a trip" %>

+ <%= f.label :cost%> + <%= f.text_field :cost%> + + <%= f.label :rating%> + <%= f.text_field :rating%> + + <%= f.label :driver%> + <%= f.select :driver_id, Driver.all.map {|driver| [driver.name, driver.id] } %> + + <%= f.submit "Edit trip", class: "trip-form__submit-btn" %> +<% end %> \ No newline at end of file diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 000000000..6243dc731 --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1 @@ +<%= link_to "All Drivers", drivers_path %> \ No newline at end of file diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..0c518ce1f --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,32 @@ +

<%= "Trip ##{@trip.id}"%>

+ + + + +<%= link_to "Back to All Trips", passenger_trips_path%> + +<%= link_to "Delete Trip", trip_path, method: :delete %> 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..2065e05c4 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +EONKHcyEWqlH+hvHJ6FjAJsOeRXE2iJNH7ZsC5M9aoVv2j20Cdjx8iKiBvPHWsAv8ku6SHMvhRUTUSOk63+BgFMwfV00Z373s9WnfeFKQVsRJH3C2rjUc3Ef/pa2Vz6j/LiusCkUMLxeHFVZ4bx8tEJQ0GW6AC5mBAkpi8uCVRpxQ5/e1+iNELsodfz+anXmGh7OcU6p0IcRxYbo1LHSfZrEjvZyG+/xkkYtrrZndbPKgxRS6CummOMvqvFuu47fWn35dROrnsrGv/kIZNlCpf5dyzNEXMLYziQs/e04omODADwM0nqUVS2zWPl3TEUzbeyBcrwXh6RG8aFE4SwnE15Ymgx+IFA8P3eXtaifoeS0reX0NOdPt/ex4TtoCxVla6/rxh7GrFwpFVAHrvpdMt+o8/QOWnw+ijzM--mkieQIsX5BKUsgwF--kZgkenja7WAYe9oL8RgV1A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..684902e69 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: ride-share-rails_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: ride-share-rails + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: ride-share-rails_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: ride-share-rails_production + username: ride-share-rails + password: <%= ENV['RIDE-SHARE-RAILS_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..cee449f7b --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "ride-share-rails_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..911018c11 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,14 @@ +Rails.application.routes.draw do + root to: "homepage#index" + resources :homepage + + resources :drivers + + resources :trips + + resources :passengers do + resources :trips + end + + # 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/db/migrate/20190415223932_create_passengers.rb b/db/migrate/20190415223932_create_passengers.rb new file mode 100644 index 000000000..5a97a2640 --- /dev/null +++ b/db/migrate/20190415223932_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + t.string :name + t.string :phone_number + + t.timestamps + end + end +end diff --git a/db/migrate/20190415224230_create_drivers.rb b/db/migrate/20190415224230_create_drivers.rb new file mode 100644 index 000000000..bf624557d --- /dev/null +++ b/db/migrate/20190415224230_create_drivers.rb @@ -0,0 +1,13 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + t.boolean :active + t.string :car_make + t.string :car_model + + t.timestamps + end + end +end diff --git a/db/migrate/20190415224826_create_trips.rb b/db/migrate/20190415224826_create_trips.rb new file mode 100644 index 000000000..c83f68897 --- /dev/null +++ b/db/migrate/20190415224826_create_trips.rb @@ -0,0 +1,13 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.integer :driver_id + t.integer :passenger_id + t.string :date + t.integer :rating + t.float :cost + + t.timestamps + end + end +end diff --git a/db/migrate/20190416183410_remove_driverid_and_passengerid_columns.rb b/db/migrate/20190416183410_remove_driverid_and_passengerid_columns.rb new file mode 100644 index 000000000..46f931561 --- /dev/null +++ b/db/migrate/20190416183410_remove_driverid_and_passengerid_columns.rb @@ -0,0 +1,6 @@ +class RemoveDriveridAndPassengeridColumns < ActiveRecord::Migration[5.2] + def change + remove_column :trips, :driver_id + remove_column :trips, :passenger_id + end +end diff --git a/db/migrate/20190416183517_add_foreign_keys.rb b/db/migrate/20190416183517_add_foreign_keys.rb new file mode 100644 index 000000000..d7ac5b67c --- /dev/null +++ b/db/migrate/20190416183517_add_foreign_keys.rb @@ -0,0 +1,6 @@ +class AddForeignKeys < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :driver, foreign_key: true + add_reference :trips, :passenger, foreign_key: true + end +end diff --git a/db/migrate/20190416220156_update_foreign_key_to_cascade.rb b/db/migrate/20190416220156_update_foreign_key_to_cascade.rb new file mode 100644 index 000000000..eebaf7530 --- /dev/null +++ b/db/migrate/20190416220156_update_foreign_key_to_cascade.rb @@ -0,0 +1,6 @@ +class UpdateForeignKeyToCascade < ActiveRecord::Migration[5.2] + def change + remove_foreign_key :trips, :drivers + remove_foreign_key :trips, :passengers + end +end diff --git a/db/migrate/20190416220505_add_cascade_to_foreign_key.rb b/db/migrate/20190416220505_add_cascade_to_foreign_key.rb new file mode 100644 index 000000000..ad8f4b90f --- /dev/null +++ b/db/migrate/20190416220505_add_cascade_to_foreign_key.rb @@ -0,0 +1,6 @@ +class AddCascadeToForeignKey < ActiveRecord::Migration[5.2] + def change + add_foreign_key :trips, :drivers, on_delete: :cascade + add_foreign_key :trips, :passengers, on_delete: :cascade + end +end diff --git a/db/migrate/20190418010520_add_driver_status.rb b/db/migrate/20190418010520_add_driver_status.rb new file mode 100644 index 000000000..593346a4f --- /dev/null +++ b/db/migrate/20190418010520_add_driver_status.rb @@ -0,0 +1,5 @@ +class AddDriverStatus < ActiveRecord::Migration[5.2] + def change + add_column :drivers, :status, :boolean, default: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..cf07dcb1c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,50 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_04_18_010520) 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.boolean "active" + t.string "car_make" + t.string "car_model" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "status", default: true + end + + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phone_number" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.string "date" + t.integer "rating" + t.float "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "driver_id" + t.bigint "passenger_id" + t.index ["driver_id"], name: "index_trips_on_driver_id" + t.index ["passenger_id"], name: "index_trips_on_passenger_id" + end + + add_foreign_key "trips", "drivers", on_delete: :cascade + add_foreign_key "trips", "passengers", on_delete: :cascade +end diff --git a/db/seeds.rb b/db/seeds.rb index eab2a92ee..264756853 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,14 +1,14 @@ -require 'csv' +require "csv" -DRIVER_FILE = Rails.root.join('db', 'seed_data', 'drivers.csv') +DRIVER_FILE = Rails.root.join("db", "seed_data", "drivers.csv") puts "Loading raw driver data from #{DRIVER_FILE}" driver_failures = [] CSV.foreach(DRIVER_FILE, :headers => true) do |row| driver = Driver.new - driver.id = row['id'] - driver.name = row['name'] - driver.vin = row['vin'] + driver.id = row["id"] + driver.name = row["name"] + driver.vin = row["vin"] successful = driver.save if !successful driver_failures << driver @@ -21,17 +21,15 @@ puts "Added #{Driver.count} driver records" puts "#{driver_failures.length} drivers failed to save" - - -PASSENGER_FILE = Rails.root.join('db', 'seed_data', 'passengers.csv') +PASSENGER_FILE = Rails.root.join("db", "seed_data", "passengers.csv") puts "Loading raw passenger data from #{PASSENGER_FILE}" passenger_failures = [] CSV.foreach(PASSENGER_FILE, :headers => true) do |row| passenger = Passenger.new - passenger.id = row['id'] - passenger.name = row['name'] - passenger.phone_num = row['phone_num'] + passenger.id = row["id"] + passenger.name = row["name"] + passenger.phone_number = row["phone_num"] successful = passenger.save if !successful passenger_failures << passenger @@ -44,20 +42,18 @@ puts "Added #{Passenger.count} passenger records" puts "#{passenger_failures.length} passengers failed to save" - - -TRIP_FILE = Rails.root.join('db', 'seed_data', 'trips.csv') +TRIP_FILE = Rails.root.join("db", "seed_data", "trips.csv") puts "Loading raw trip data from #{TRIP_FILE}" trip_failures = [] CSV.foreach(TRIP_FILE, :headers => true) do |row| trip = Trip.new - trip.id = row['id'] - trip.driver_id = row['driver_id'] - trip.passenger_id = row['passenger_id'] - trip.date = Date.strptime(row['date'], '%Y-%m-%d') - trip.rating = row['rating'] - trip.cost = row['cost'] + trip.id = row["id"] + trip.driver_id = row["driver_id"] + trip.passenger_id = row["passenger_id"] + trip.date = Date.strptime(row["date"], "%Y-%m-%d") + trip.rating = row["rating"] + trip.cost = row["cost"] successful = trip.save if !successful trip_failures << trip @@ -70,7 +66,6 @@ puts "Added #{Trip.count} trip records" puts "#{trip_failures.length} trips failed to save" - # Since we set the primary key (the ID) manually on each of the # tables, we've got to tell postgres to reload the latest ID # values. Otherwise when we create a new record it will try 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.txt b/test.txt 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/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 59e15818c..79bb21a5d 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,33 +1,157 @@ require "test_helper" describe DriversController do + let (:driver) { + Driver.create name: "Sample Driver", vin: "11111111111111111" + } describe "index" do it "can get index" do - # Your code here + # Act + get drivers_path + + # Assert + must_respond_with :success end end describe "show" do - # Your tests go here + # test failing due to a / 0 error? + it "can get a valid driver" do + + # Act + get driver_path(driver.id) + + # Assert + must_respond_with :success + end + it "will redirect for an invalid driver" do + + # Act + get driver_path(-1) + + # Assert + must_respond_with :redirect + end end describe "edit" do - # Your tests go here + it "can get the edit page for an existing driver" do + + # Act + get edit_driver_path(driver.id) + + # Assert + must_respond_with :success + end + + it "will respond with redirect when attempting to edit a nonexistant driver" do + + # Arrange + id = -1 + # Act + get edit_driver_path(id) + + # Assert + must_respond_with :redirect + end end describe "update" do - # Your tests go here + it "can update an existing driver" do + # Arrange + driver_hash = { + driver: { + name: "Another Sample", + vin: "22222222222222222", + }, + } + + # Act + patch driver_path(driver.id), params: driver_hash + driver.reload #use .reload to access database again (fresh data) + + # Assert + expect(driver.name).must_equal "Another Sample" + end + + it "will redirect to the root page if not updated successfully" do + + # Arrange + driver_hash = { + driver: { + driver_name: "Sample Three", + vin: "33333333333333333", + }, + } + + # Act + patch driver_path(driver.id), params: driver_hash + # do not get new data from database using driver.reload to simulate failing to save the changes + + # Assert + must_respond_with :redirect + end end describe "new" do - # Your tests go here + it "can get the new driver page" do + + # Act + get new_driver_path + + # Assert + must_respond_with :success + end end describe "create" do - # Your tests go here + it "can create a new driver" do + + # Arrange + driver_hash = { + driver: { + name: "Sample Four", + vin: "444444444444444444", + }, + } + + # Act-Assert + expect { + post drivers_path, params: driver_hash + }.must_change "Driver.count", 1 + + new_driver = Driver.find_by(name: driver_hash[:driver][:name]) + expect(new_driver.name).must_equal driver_hash[:driver][:name] + expect(new_driver.vin).must_equal driver_hash[:driver][:vin] + + must_respond_with :redirect + must_redirect_to drivers_path #change this if we decide to redirect elsewhere + end end describe "destroy" do - # Your tests go here + it "can delete a driver" do + # Arrange + new_driver = Driver.create(name: "Sample Four", vin: "44444444444444444") + + expect { + # Act + delete driver_path(new_driver.id) + # Assert + }.must_change "Driver.count", -1 + + must_respond_with :redirect + must_redirect_to drivers_path + end + it "responds with a not found error if driver id is invalid" do + # Arrange + id = -1 + + # Act + delete driver_path(id) + + # Assert + must_respond_with :not_found + end end end diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 9dd7648db..0cd862c87 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,9 +1,9 @@ -require "test_helper" +# require "test_helper" describe HomepagesController do - it "can get the homepage" do - get root_path + # it "can get the homepage" do + # get root_path - must_respond_with :success - end + # must_respond_with :success + # end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index d6030cbf6..b8c0f3d19 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,31 +1,156 @@ require "test_helper" describe PassengersController do + let (:passenger) { + Passenger.create name: "Sample Passenger", phone_number: "123-456-7890" + } describe "index" do - # Your tests go here + it "can get index" do + # Act + get passengers_path + + # Assert + must_respond_with :success + end end describe "show" do - # Your tests go here + it "can get a valid passenger" do + + # Act + get passenger_path(passenger.id) + + # Assert + must_respond_with :success + end + it "will redirect for an invalid passenger" do + + # Act + get passenger_path(-1) + + # Assert + must_respond_with :redirect + end end describe "edit" do - # Your tests go here + it "can get the edit page for an existing passenger" do + + # Act + get edit_passenger_path(passenger.id) + + # Assert + must_respond_with :success + end + it "will respond with redirect when attempting to edit a nonexistant passenger" do #add redirect + + # Arrange + id = -1 + # Act + get edit_passenger_path(id) + + # Assert + must_respond_with :redirect + end end describe "update" do - # Your tests go here + it "can update an existing passenger" do + # Arrange + passenger_hash = { + passenger: { + name: "Another Sample", + phone_number: "222-222-2222", + }, + } + + # Act + patch passenger_path(passenger.id), params: passenger_hash + passenger.reload + + # Assert + expect(passenger.name).must_equal "Another Sample" + end + + it "will redirect to the root page if not updated successfully" do + + # Arrange + passenger_hash = { + passenger: { + passenger_name: "Sample Three", + phone_number: "333-333-3333", + }, + } + + # Act + patch passenger_path(passenger.id), params: passenger_hash + # do not get new data from database using passenger.reload to simulate failing to save the changes + + # Assert + must_respond_with :redirect + end end describe "new" do - # Your tests go here + it "can get the new passenger page" do + + # Act + get new_passenger_path + + # Assert + must_respond_with :success + end end describe "create" do - # Your tests go here + it "can create a new passenger" do + + # Arrange + passenger_hash = { + passenger: { + name: "Sample Four", + phone_number: "444-444-4444", + }, + } + + # Act-Assert + expect { + post passengers_path, params: passenger_hash + }.must_change "Passenger.count", 1 + + new_passenger = Passenger.find_by(name: passenger_hash[:passenger][:name]) + expect(new_passenger.name).must_equal passenger_hash[:passenger][:name] + expect(new_passenger.phone_number).must_equal passenger_hash[:passenger][:phone_number] + + must_respond_with :redirect + must_redirect_to passengers_path + end end describe "destroy" do - # Your tests go here + it "can delete a passenger" do + # Arrange + new_passenger = Passenger.create(name: "Sample Four", phone_number: "444-444-4444") + + expect { + # Act + delete passenger_path(new_passenger.id) + # Assert + }.must_change "Passenger.count", -1 + + must_respond_with :redirect + must_redirect_to passengers_path + end + + it "responds with a not found error if driver id is invalid" do + # Arrange + id = -1 + + # Act + delete passenger_path(id) + + # Assert + must_respond_with :not_found + end end end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 0e6b170d1..96fc9c70f 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -1,23 +1,141 @@ require "test_helper" describe TripsController do + describe "show" do - # Your tests go here + before do + passenger = Passenger.new(name: "Sample Passenger", phone_number: "123-456-7890") + passenger.save + driver = Driver.new(name: "Sample Driver", vin: "11111111111111111") + driver.save + @t = Trip.new(passenger_id: passenger.id, driver_id: driver.id, date: Time.now.strftime("%Y-%d-%m"), cost: 1300, rating: 3) + @t.save + end + + it "can show page for a valid trip" do + + get passenger_trip_path(@t.passenger_id, @t.id) +# puts @t.id + must_respond_with 200 + end + + it " returns a 302 redirect for invalid trip id" do + get passenger_trip_path(@t.passenger_id, -1) + + must_respond_with 302 + end + end + + describe "create" do + it "should create a new trip" do + date = "April 19th 2019" + cost = 2042 + rating = nil + + trip_hash = { + trip: { + date: date, + cost: cost, + passenger_id: Passenger.last.id, + driver_id: Driver.last.id, + }, + } + + expect { + post trips_path params: trip_hash + }.must_change "Trip.count", 1 + + new_trip = Trip.last + expect(new_trip).wont_be_nil + expect(new_trip.rating).must_equal nil + + must_respond_with :redirect + end + + it "returns an error for and invalid trip" do + date = "" + cost = 2042 + rating = nil + + invalid_trip = { + trip: { + date: date, + cost: cost, + passenger_id: 0, + driver_id: 1, + }, + } + + expect { + post trips_path, params: invalid_trip + }.wont_change "Trip.count" + end end describe "edit" do - # Your tests go here + it "can get to the edit trip view for existing trip" do + get edit_trip_path(Trip.first.id) + + must_respond_with :success + end + + it "should respond with 404 if the trip doesn't exist" do + get edit_trip_path(-1) + + must_respond_with 302 + end end describe "update" do - # Your tests go here - end + trip = Trip.first - describe "create" do - # Your tests go here + trip_hash = { + trip: { + date: "April 19, 2019", + cost: 1445, + passenger_id: Passenger.last.id, + driver_id: Driver.last.id, + }, + } + + it "should update existing trip" do + expect { + patch trip_path(trip.id), params: trip_hash + }.wont_change "Trip.count" + + must_respond_with :redirect + end + + it "should redirect to the edit page if given an invalid trip " do + patch trip_path(500), params: trip_hash + + must_respond_with :redirect + end end describe "destroy" do - # Your tests go here + before do + passenger = Passenger.new(name: "Sample Passenger", phone_number: "123-456-7890") + passenger.save + driver = Driver.new(name: "Sample Driver", vin: "11111111111111111") + driver.save + @t2 = Trip.new(passenger_id: passenger.id, driver_id: driver.id, date: Time.now.strftime("%Y-%d-%m"), cost: 1300, rating: 3) + @t2.save + end + it "can delete a trip" do + expect { + delete trip_path(@t2.id) + }.must_change "Trip.count", -1 + + must_respond_with :redirect + end + + it "should respond with a 404 if the trip is not found" do + expect { + delete trip_path(-1) + }.wont_change "Trip.count" + + must_respond_with :not_found + end end end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/drivers.yml b/test/fixtures/drivers.yml new file mode 100644 index 000000000..ca7052ab2 --- /dev/null +++ b/test/fixtures/drivers.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + vin: MyString + active: false + car_make: MyString + car_model: MyString + +two: + name: MyString + vin: MyString + active: false + car_make: MyString + car_model: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/passengers.yml b/test/fixtures/passengers.yml new file mode 100644 index 000000000..e1f1a49bf --- /dev/null +++ b/test/fixtures/passengers.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + phone_number: MyString + +two: + name: MyString + phone_number: MyString diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml new file mode 100644 index 000000000..645842d07 --- /dev/null +++ b/test/fixtures/trips.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + driver_id: 1 + passenger_id: 1 + date: MyString + rating: 1 + cost: 1.5 + +two: + driver_id: 1 + passenger_id: 1 + date: MyString + rating: 1 + cost: 1.5 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/models/driver_test.rb b/test/models/driver_test.rb deleted file mode 100644 index 44f62ff69..000000000 --- a/test/models/driver_test.rb +++ /dev/null @@ -1,78 +0,0 @@ -require "test_helper" - -describe Driver do - let (:new_driver) { - Driver.new(name: "Kari", vin: "123", active: true, - car_make: "Cherry", car_model: "DR5") - } - it "can be instantiated" do - # Assert - expect(new_driver.valid?).must_equal true - end - - it "will have the required fields" do - # Arrange - driver = Driver.first - [:name, :vin, :active, :car_make, :car_model].each do |field| - - # Assert - expect(driver).must_respond_to field - end - end - - describe "relationships" do - it "can have many trips" do - # Arrange - driver = Driver.first - - # Assert - expect(driver.trips.count).must_be :>=, 0 - driver.trips.each do |trip| - expect(trip).must_be_instance_of Trip - end - end - end - - describe "validations" do - it "must have a name" do - # Arrange - new_driver.name = nil - - # Assert - expect(new_driver.valid?).must_equal false - expect(new_driver.errors.messages).must_include :name - expect(new_driver.errors.messages[:name]).must_equal ["can't be blank"] - end - - it "must have a VIN number" do - # Arrange - new_driver.vin = nil - - # Assert - expect(new_driver.valid?).must_equal false - expect(new_driver.errors.messages).must_include :vin - expect(new_driver.errors.messages[:vin]).must_equal ["can't be blank"] - end - end - - # Tests for methods you create should go here - describe "custom methods" do - describe "average rating" do - # Your code here - end - - describe "total earnings" do - # Your code here - end - - describe "can go online" do - # Your code here - end - - describe "can go offline" do - # Your code here - end - - # You may have additional methods to test - end -end diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb deleted file mode 100644 index 23f974ff9..000000000 --- a/test/models/passenger_test.rb +++ /dev/null @@ -1,68 +0,0 @@ -require "test_helper" - -describe Passenger do - let (:new_passenger) { - Passenger.new(name: "Kari", phone_number: "111-111-1211") - } - it "can be instantiated" do - # Assert - expect(new_passenger.valid?).must_equal true - end - - it "will have the required fields" do - # Arrange - passenger = Passenger.first - [:name, :phone_number].each do |field| - - # Assert - expect(passenger).must_respond_to field - end - end - - describe "relationships" do - it "can have many trips" do - # Arrange - passenger = Passenger.first - - # Assert - expect(passenger.trips.count).must_be :>, 0 - passenger.trips.each do |trip| - expect(trip).must_be_instance_of Trip - end - end - end - - describe "validations" do - it "must have a name" do - # Arrange - new_passenger.name = nil - - # Assert - expect(new_passenger.valid?).must_equal false - expect(new_passenger.errors.messages).must_include :name - expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"] - end - - it "must have a phone number" do - # Arrange - new_passenger.phone_number = nil - - # Assert - expect(new_passenger.valid?).must_equal false - expect(new_passenger.errors.messages).must_include :new_passenger - expect(new_passenger.errors.messages[:new_passenger]).must_equal ["can't be blank"] - end - end - - # Tests for methods you create should go here - describe "custom methods" do - describe "request a ride" do - # Your code here - end - - describe "complete trip" do - # Your code here - end - # You may have additional methods to test here - end -end diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb deleted file mode 100644 index 0b0b2da32..000000000 --- a/test/models/trip_test.rb +++ /dev/null @@ -1,24 +0,0 @@ -require "test_helper" - -describe Trip do - it "can be instantiated" do - # Your code here - end - - it "will have the required fields" do - # Your code here - end - - describe "relationships" do - # Your tests go here - end - - describe "validations" do - # Your tests go here - end - - # Tests for methods you create should go here - describe "custom methods" do - # Your tests here - end -end 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/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb