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..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..87a48610f --- /dev/null +++ b/Gemfile @@ -0,0 +1,83 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'minitest-skip' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..1696f55d3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.8.1) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + capybara (3.29.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + childprocess (3.0.0) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + debug_inspector (0.0.3) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.11.1) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.9.1) + activesupport (>= 4.2.0) + jquery-rails (4.3.5) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.12.2) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) + msgpack (1.3.1) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (4.0.1) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.6.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + rubyzip (2.0.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.1.0) + railties (>= 5.2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + debase (>= 0.2.4.1) + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-skip + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/images/header_blue.png b/app/assets/images/header_blue.png new file mode 100644 index 000000000..59553ca45 Binary files /dev/null and b/app/assets/images/header_blue.png differ diff --git a/app/assets/images/header_logo.png b/app/assets/images/header_logo.png new file mode 100644 index 000000000..1694315a8 Binary files /dev/null and b/app/assets/images/header_logo.png differ diff --git a/app/assets/images/rideshare.png b/app/assets/images/rideshare.png new file mode 100644 index 000000000..8144ab22e Binary files /dev/null and b/app/assets/images/rideshare.png differ diff --git a/app/assets/images/skyline_grey.png b/app/assets/images/skyline_grey.png new file mode 100644 index 000000000..676f364c1 Binary files /dev/null and b/app/assets/images/skyline_grey.png differ diff --git a/app/assets/images/skyline_grey_header.png b/app/assets/images/skyline_grey_header.png new file mode 100644 index 000000000..724ecac16 Binary files /dev/null and b/app/assets/images/skyline_grey_header.png differ diff --git a/app/assets/images/title_green.png b/app/assets/images/title_green.png new file mode 100644 index 000000000..99ea5c124 Binary files /dev/null and b/app/assets/images/title_green.png differ diff --git a/app/assets/images/top_corner_logo.png b/app/assets/images/top_corner_logo.png new file mode 100644 index 000000000..4f3a4387c Binary files /dev/null and b/app/assets/images/top_corner_logo.png differ 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/javascripts/drivers.js b/app/assets/javascripts/drivers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/drivers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/homepage.js b/app/assets/javascripts/homepage.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/homepage.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/homepages.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/passengers.js b/app/assets/javascripts/passengers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/passengers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/trips.js b/app/assets/javascripts/trips.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/trips.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..8487f623c --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,137 @@ +/* + * 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 + */ + *{ + font-family: 'Nunito', sans-serif; + } +nav { + text-align: right; + + +} + +.grid-container{ + display: grid; + grid-template-columns: 80% auto auto auto; + align-items: center; + +} + +.nav_img { + grid-column: 1; + display: inline; + float: left; + +} + +.dropdown_p { + grid-column: 2; +} +.dropdown_d { + grid-column: 3; +} +.dropdown_t { + grid-column: 4; +} + +nav section { + width: 20%; + } + + /*Dropdown Button */ +button { + background-color: #4CAF50; + color: white; + padding: 16px; + font-size: 16px; + border: none; +} + +/* The container
- needed to position the dropdown content */ +.dropdown { + position: relative; + display: inline-block; +} + +/* Dropdown Content (Hidden by Default) */ +.dropdown-content { + display: none; + position: absolute; + background-color: #f1f1f1; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; +} + +/* Links inside the dropdown */ +.dropdown-content a { + color: black; + text-decoration: none; + display: block; + +} + +/* Change color of dropdown links on hover */ +.dropdown-content a:hover {background-color: #ddd;} + +/* Show the dropdown menu on hover */ +.dropdown_p:hover .dropdown-content {display: block; max-width: 75px;} +.dropdown_t:hover .dropdown-content {display: block; max-width: 75px;} +.dropdown_d:hover .dropdown-content {display: block; max-width: 75px;} +/* Change the background color of the dropdown button when the dropdown content is shown */ +.dropdown_p:hover .dropbtn {background-color: #3e8e41;} + + + +.wrapper_trips { + width: 90%; + margin-left: 5%; + + justify-items: center; + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + grid-gap: 10px; + grid-auto-rows: 20px; +} + +.wrapper_pd_trips { + width: 90%; + margin-left: 5%; + justify-items: center; + display: grid; + grid-template-columns: 1fr 1fr 2fr 1fr 1fr 1fr 1fr; + grid-gap: 10px; + grid-auto-rows: 20px; +} + +.wrapper_people { + width: 90%; + margin-left: 5%; + justify-items: left; + display: flex; + max-height: 1600px; + flex-direction: column; + flex-wrap: wrap; +} + +.heading { + width: 80%; + display: grid; + grid-template-columns: 1fr 4fr; + text-align: left; + margin-left: 5%; + + align-items: center; + +} \ No newline at end of file diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss new file mode 100644 index 000000000..8c1768a14 --- /dev/null +++ b/app/assets/stylesheets/drivers.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Drivers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/homepage.scss b/app/assets/stylesheets/homepage.scss new file mode 100644 index 000000000..9027e07a0 --- /dev/null +++ b/app/assets/stylesheets/homepage.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the homepage controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 000000000..ebcd5fec3 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,13 @@ +// Place all the styles related to the homepages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +.header_img { + margin-top: 5%; + text-align: center; +} +.footer_img { + text-align: center; + margin-top: 5%; + width: 100%; +} \ No newline at end of file diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss new file mode 100644 index 000000000..12e64e3e7 --- /dev/null +++ b/app/assets/stylesheets/passengers.scss @@ -0,0 +1,4 @@ +// Place all the styles related to the Passengers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss new file mode 100644 index 000000000..47a08bf9e --- /dev/null +++ b/app/assets/stylesheets/trips.scss @@ -0,0 +1,31 @@ +// 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/ + +.wrapper { + width: 90%; + margin-left: 5%; + + justify-items: center; + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + grid-gap: 10px; + grid-auto-rows: 20px; +} + +.heading { + width: 80%; + display: grid; + grid-template-columns: 1fr 4fr; + text-align: left; + margin-left: 5%; + + align-items: center; + +} + + + + + + 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..c43db3b27 --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,90 @@ +class DriversController < ApplicationController + def index + @drivers = Driver.all + end + + def show + driver_id = params[:id] + @driver = Driver.find_by(id: driver_id) + if @driver.nil? + head :not_found + return + end + end + + def new + @driver = Driver.new + end + + def create + #Handle Validation Errors + @driver = Driver.new(driver_params) + if @driver.save + redirect_to drivers_path + return + else + render :new + end + end + + def edit + @driver = Driver.find_by(id: params[:id]) + if @driver.nil? + redirect_to driver_path + head :not_found + return + end + end + + def update + #Handle Validation Errors + @driver = Driver.find_by(id: params[:id]) + if @driver.nil? + head :not_found + return + #anytime we do a head or render or redirect + end + if @driver.update(driver_params) + redirect_to driver_path(@driver.id) + return + else + render driver_path + end + end + + def active + driver_id = params[:id] + @driver = Driver.find_by(id: params[:id]) + if @driver.active == true + @driver.active = false + @driver.save + else + @driver.active == false + @driver.active = true + @driver.save + end + redirect_to drivers_path + end + + def destroy + driver_id = params[:id] + @driver = Driver.find_by(id: driver_id) + if @driver.nil? + head :not_found + return + end + @driver.destroy + redirect_to drivers_path + return + end + + private + + def driver_params + return params.require(:driver).permit(:driver_id, :name, + :vin, :make, :model, :active) + end + end#end of class + + + \ No newline at end of file diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 000000000..675c43707 --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,6 @@ +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..6f00e382a --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,76 @@ +class PassengersController < ApplicationController + def index + @passengers = Passenger.all + end + + def show + passenger_id = params[:id] + @passenger = Passenger.find_by(id: passenger_id) + + if @passenger.nil? + head :not_found + return + end + end + + def edit + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + head :not_found + return + end + end + + def update + #Handle Validation Errors + + @passenger = Passenger.find_by(id: params[:id]) + if @passenger.update(passenger_params) + redirect_to passenger_path(@passenger.id) # go to the index so we can see the book in the list + return + else # save failed :( + render :edit # show the new book form view again + return + end + end + + def new + @passenger = Passenger.new + end + + def create + #Handle Validation Errors + + @passenger = Passenger.new(passenger_params) #instantiate a new passenger + if @passenger.save # save returns true if the database insert succeeds + redirect_to passengers_path # go to the index so we can see the passenger in the list + return + else # save failed :( + render :new # show the new book form view again + return + end + end + + def destroy + passenger_id = params[:id] + @passenger = Passenger.find_by(id: passenger_id) + + if @passenger.nil? + head :not_found + return + end + + @passenger.destroy + + redirect_to passengers_path + return + end + + private + + def passenger_params + return params.require(:passenger).permit(:passenger_id, :name, :phone_num) + end + +end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..1b6f1240f --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,88 @@ +class TripsController < ApplicationController + def index + @trips = Trip.all + @drivers = Driver.all + @passengers = Passenger.all + end + + def show + trip_id = params[:id] + @trip = Trip.find_by(id: trip_id) + if @trip.nil? + head :not_found + return + end + end + + def edit + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + end + + def update + #Handle Validation Errors + + @trip = Trip.find_by(id: params[:id]) + if @trip.update(trip_params) + redirect_to passenger_path(@trip.passenger_id) # go to the index so we can see the book in the list + return + else # save failed :( + render :edit # show the new book form view again + return + end + end + + def new + if params[:passenger_id] + # This is the nested route, /author/:author_id/books/new + passenger = Passenger.find_by(id: params[:passenger_id]) + @trip = passenger.trips.new + + else + # This is the 'regular' route, /books/new + @trip = Trip.new + end + end + + def create + #Handle Validation Errors + generated_trips_params = { + date: Time.now, + passenger_id: params[:passenger_id], + driver_id: 1, + cost: rand(4..99) + } + @trip = Trip.new(generated_trips_params) #instantiate a new book + + if @trip.save # save returns true if the database insert succeeds + redirect_to passenger_path(params[:passenger_id]) # go to the index so we can see the book in the list + return + else # save failed :( + render :new # show the new book form view again + return + end + end + + def destroy + # Arrange + # Ensure there is an existing driver saved + new_trip = Trip.create(date: Time.now, passenger_id: "4", driver_id: "5", cost: 8) + # Act-Assert + #Ensure that there is a change of -1 in Driver.count + expect {delete trip_path(new_trip.id)}.must_differ 'Trip.count', -1 + # Assert + # Check that the controller redirects + must_respond_with :redirect + must_redirect_to trips_path + end + + private + + def trip_params + return params.require(:trip).permit(:trip_id, :date, :passenger_id, :driver_id, :cost, :rating) + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..7f3770729 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,11 @@ +module ApplicationHelper + + def readable_date(date) + return "[unknown]" unless date + return ( + "".html_safe + + time_ago_in_words(date) + " ago".html_safe + ) + end + +end diff --git a/app/helpers/drivers_helper.rb b/app/helpers/drivers_helper.rb new file mode 100644 index 000000000..e5fc532e4 --- /dev/null +++ b/app/helpers/drivers_helper.rb @@ -0,0 +1,2 @@ +module DriversHelper +end diff --git a/app/helpers/homepage_helper.rb b/app/helpers/homepage_helper.rb new file mode 100644 index 000000000..c5bbfe518 --- /dev/null +++ b/app/helpers/homepage_helper.rb @@ -0,0 +1,2 @@ +module HomepageHelper +end diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 000000000..4bd8098f3 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/helpers/passengers_helper.rb b/app/helpers/passengers_helper.rb new file mode 100644 index 000000000..1af9e68f1 --- /dev/null +++ b/app/helpers/passengers_helper.rb @@ -0,0 +1,2 @@ +module PassengersHelper +end diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb new file mode 100644 index 000000000..04f333d46 --- /dev/null +++ b/app/helpers/trips_helper.rb @@ -0,0 +1,2 @@ +module TripsHelper +end 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..02b9f5060 --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,29 @@ +class Driver < ApplicationRecord + has_many :trips + + ##Validation Code + validates :name, presence: true; + validates :vin, presence: true, uniqueness: true + + #logic for drivers total earnings here. + #logic for drivers average rating here. + def average_rating + average = 0 + count = 0 + self.trips.each do |trip| + average += trip.rating.to_i + count += 1 + end + return average / count + end + + def total_earnings + total = 0 + self.trips.each do |trip| + total += (trip.cost.to_f - 1.65) * 0.80 + end + # total = total * 0.10 + return total + end + +end \ No newline at end of file diff --git a/app/models/passenger.rb b/app/models/passenger.rb new file mode 100644 index 000000000..a69b92f85 --- /dev/null +++ b/app/models/passenger.rb @@ -0,0 +1,17 @@ +class Passenger < ApplicationRecord + has_many :trips + + #Validation Code + validates :name, presence: true; + validates :phone_num, presence: true, uniqueness: true + + def total_spent + total = 0 + self.trips.each do |trip| + total += trip.cost.to_f + end + # total = total * 0.10 + return total + end + +end \ No newline at end of file diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..cfc57ba3b --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,12 @@ +class Trip < ApplicationRecord + belongs_to :driver + belongs_to :passenger + + #Validation Code + + def trip_cost + random_cost = (rand(100.00..500.99)).round(2) + return random_cost + end + +end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..82ed64670 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,33 @@ +<% if @driver.errors.any? %> +

Errors

+ +<% end %> + +

Please provide the following information to <%= verb_name %> be a new drivers in our database:

+ +<%= form_with model: @driver, class: "driver-input" do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :vin%> + <%= f.text_area :vin %> + + <%= f.label :make %> + <%= f.text_area :make %> + + <%= f.label :model %> + <%= f.text_area :model %> + + <%= f.label :active %> + <%= f. check_box :active, { onChange: 'this.form.submit();' , checked: @driver.active != nil} %> + + <%= f.submit "#{action_name} Driver", class: "driver-button" %> + +<% end %> diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..703e2ff85 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1 @@ +<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..4266aec71 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,10 @@ +
+

Drivers

<%= button_to "Add New Driver", new_driver_path, :method => "get" %> +
+
+ <% @drivers.each do |driver| %> +
<%= driver.id %>:<%= link_to driver.name, driver_path(driver) %>
+ <% end %> + + +
diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..f560b17f2 --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "New", verb_name: "create" } %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..e2f2009a2 --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,40 @@ +

Name: <%= @driver.name %>

+

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

+

Average Earnings: <%= @driver.total_earnings%>

+ + + + <%= link_to "Edit", edit_driver_path(@driver) %> + <%= link_to "Delete", driver_path(@driver), method: :delete, data: {confirm: "Are you sure?"}%> +

<%= link_to "Return to Drivers List", drivers_path %>

+ +
+
TRIP ID
+
DATE
+
PASSENGER
+
RATING
+
COST
+
EDIT
+
DELETE
+ +<% @driver.trips.each do |trip| %> +
<%= trip.id %>
+
<%= trip.date %>
+
<%= trip.passenger.name %>
+
<%= trip.rating %>
+
$<%= trip.cost%>
+
<%= link_to "Edit Trip", edit_trip_path(trip.id) %>
+
<%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%>
+<% end %> +
\ No newline at end of file diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 000000000..1ad2503c4 --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,6 @@ +
+ <%= image_tag "rideshare.png" %> +
+
+ <%= image_tag "skyline_grey.png" %> +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..2d9a0216b --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,44 @@ + + + + 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/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..90e4c7174 --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,23 @@ +<% if @passenger.errors.any? %> +

Errors

+ +<% end %> + +

Please provide the following information to <%= verb_name %> a passenger to our database:

+ +<%= form_with model: @passenger, class: 'create-passenger' do |f| %> + +<%= f.label :name, "Name: " %> +<%= f.text_field :name %> + +<%= f.label :phone_num, "Phone Number: " %> +<%= f.text_field :phone_num %> + +<%= f.submit "Save Passenger", class: "passenger-save" %> +<% 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..71cfdd82e --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1 @@ +<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %> \ 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..8526bebf2 --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,8 @@ +
+

Passengers

<%= button_to "Add New Passenger", new_passenger_path, :method => "get" %> +
+
+ <% @passengers.each do |passenger| %> +
<%= passenger.id %>: <%= link_to passenger.name, passenger_path(passenger) %>
+ <% end %> +
\ No newline at end of file diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..ca2e248fb --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1 @@ + <%= render partial: "form", locals: { action_name: "New", verb_name: "add" } %> \ 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..e4b3ae11a --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,29 @@ +

Name: <%= @passenger.name %>

+

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

+

Total Amount Spent: $<%= @passenger.total_spent %> + +

<%= link_to "Edit Passenger", edit_passenger_path %>

+

<%= link_to "Delete Passenger", passenger_path(@passenger), method: :delete, data: {confirm: "Are you sure?"}%>

+
+
TRIP ID
+
DATE
+
DRIVER
+
RATING
+
COST
+
EDIT
+
DELETE
+<% @passenger.trips.each do |trip| %> +
<%= trip.id %>
+
<%= trip.date %>
+
<%= trip.driver.name %>
+
<%= trip.rating %>
+
$<%= trip.cost%>
+
<%= link_to "Edit Trip Rating", edit_trip_path(trip.id) %>
+
<%= link_to "Delete Trip", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%>
+<% end %> +
+ +

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

+

<%= link_to "Return to Passenger List", passengers_path %>

+ + diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb new file mode 100644 index 000000000..314fb2cd3 --- /dev/null +++ b/app/views/trips/_form.html.erb @@ -0,0 +1,62 @@ +<% if @trip.errors.any? %> +

Errors

+ +<% end %> + +

Please provide the following information to <%= verb_name %> a trip to our database:

+ +<%= form_with model: @trip, class: 'create-trip' do |f| %> + +<% if @trip.date.nil? %> + <%= f.label :date %> + <%= f.date_field :date, :value => Time.now.strftime('%Y-%m-%d') %> +<% else %> +<%= hidden_field_tag 'date', @trip.date%> +<%= f.hidden_field :date %> +Date: <%= @trip.date %> +<% end %> + +<% if @trip.passenger.nil? %> + <%= f.label :passenger_id %> + <%= f.select :passenger_id, Passenger.all.map{ |passenger| [passenger.name, passenger.id] } %> +<% else %> + <%= f.hidden_field :passenger_id %> + <%= hidden_field_tag 'passenger_id', @trip.passenger.id %> + Passenger: <%= @trip.passenger.name %> +<% end %> + +<% if @trip.driver.nil? %> + <%= f.label :driver_id %> + <%= f.select :driver_id, Driver.all.map{ |driver| [driver.name, driver.id] } %> +<% else %> + <%= f.hidden_field :driver_id %> + <%= hidden_field_tag 'driver_id', @trip.driver.id %> + Driver: <%= @trip.driver.name %> +<% end %> + +<%= f.label :rating, "Rating: " %> +<%= f.select :rating, [' ', '1', '2', '3', '4', '5']%> + +<% random_cost = @trip.trip_cost %> +<% if @trip.cost.nil? %> + <%= f.hidden_field :cost, :value => random_cost %>

+ <%= hidden_field_tag 'cost', @trip.cost %> +<% elsif @user == "trip" %> + <% f.label :cost %> + <% f.text_field :cost, :value => @trip.cost %> + Cost: $<%= random_cost %> +<% else %> + <%= f.hidden_field :cost %> + <%= hidden_field_tag 'cost', @trip.cost %> + Cost: $<%= @trip.cost %> +<% end %> + + +<%= f.submit "Save Trip", class: "trip-save" %> +<% end %> diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..b5d6e925b --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,4 @@ + +<%= render(partial: "form", locals: { action_name: "Edit", verb_name: "update" }) %> + + diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb new file mode 100644 index 000000000..d67f8b55e --- /dev/null +++ b/app/views/trips/index.html.erb @@ -0,0 +1,23 @@ +
+

Trips

<%= button_to "Add Trip", new_trip_path, :method => "get" %> +
+
+
TRIP #
+
DATE
+
PASSENGER ID
+
DRIVER ID
+
RATING
+
COST
+
EDIT
+
DELETE
+ <% @trips.each do |trip| %> +
<%= link_to trip.id, trip_path(trip.id) %>
+
<%= trip.date %>
+
<%= link_to trip.passenger_id, passenger_path(trip.passenger_id) %>
+
<%= link_to trip.driver_id, driver_path(trip.driver_id) %>
+
<%= trip.rating %>
+
$ <%= trip.cost %>
+
<%= link_to "Edit Trip", edit_trip_path(trip.id) %>
+
<%= link_to "Delete", trip_path(trip.id), method: :delete, data: {confirm: "Are you sure?"}%>
+ <% end %> +
\ No newline at end of file diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb new file mode 100644 index 000000000..db0951467 --- /dev/null +++ b/app/views/trips/new.html.erb @@ -0,0 +1 @@ + <%= render partial: "form", locals: { action_name: "New", verb_name: "add" } %> \ No newline at end of file diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..5db989412 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,13 @@ +

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

+

Date: <%= @trip.date %>

+

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

+

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

+

Passenger ID: <%= @trip.passenger.id %>

+

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

+

Rating: <%= @trip.rating %>

+

Cost: $<%= @trip.cost %>

+ +

<%= link_to "Edit Trip", edit_trip_path %>

+

<%= link_to "Delete", trip_path(@trip), method: :delete, data: {confirm: "Are you sure?"}%>

+

<%= link_to "Return to Passenger List", passengers_path %>

+

<%= link_to "Return to Driver List", drivers_path %>

diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..d89ee495f --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..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..dcd7f517e --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +xs693zusoh5EGfAb4wXB6XFqEpyZs6qf2dm59OgtA5AFXvWmtFhNzXo9pNSt7jST4Q6LPT7g4i138tnRKPXMBjYBq53IdXjxVOVULq5N3BPLKXrp7TNPPT9/Zed3R0WWOcEb+q1+llvqDtRPY5q3QsxeSOTJaePBI+0b1yjKEtgct4PkUOWF6BHlLb3HkEP4x2YsmPSFXevZNDET2JWe3bDM1ayr6R35AWhz/0xzOz1bBVezD6ZNnYws1un5tp8bDyvAZGQ6iOEtno5GCITNwJD10Ux4oYZaXXyGuQvugQ0DZB0lDMpDBs8ZA7x9Y6VGtiJuojb6tTe4wgdcSghWcgpLBP3ZB9DTLxjbp5OZ8UWKIu3yrjzmQ0WNGqPBGyC2Uv0U7t+rLqD+i7pQLsmLgnvtWO0kH74RdmOS--0NBYkbSbG27bw6wB--FB66H0Co21vmn+zfv62o9g== \ 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..46af2bd68 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,34 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'homepages#index' + resources :passengers do + resources :trips + end + + resources :drivers + resources :trips + + + # post '/drivers/:id/active', to: 'drivers#active', as: 'active_driver' + # resources :books #, except: [:index] + + + # resources :authors, only: [:index, :show] do + # resources :books, only: [:index, :new] + + # NOTES FOR REFERENCE: + # RESTful Routes Include: + # Rails.application.routes.draw do + # get "/drivers" , to: "drivers#index", as: :driver + # post "/books" , to: "books#create" + # get "/books/new" , to: "books#new", as: :new_book + # get "/books/:id" , to: "books#show", as: :book + # patch "/books/:id" , to: "books#update" + # put "/books/:id" , to: "books#update" + # delete "/books/:id" , to: "books#destroy" + # get "/books/:id/edit" , to: "books#edit", as: :edit_book + # end + +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/20191008181158_create_passengers.rb b/db/migrate/20191008181158_create_passengers.rb new file mode 100644 index 000000000..aeced4891 --- /dev/null +++ b/db/migrate/20191008181158_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + t.string :name + t.string :phone_num + + t.timestamps + end + end +end diff --git a/db/migrate/20191008181414_create_drivers.rb b/db/migrate/20191008181414_create_drivers.rb new file mode 100644 index 000000000..310efb626 --- /dev/null +++ b/db/migrate/20191008181414_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.string :make + t.string :model + t.boolean :active + + t.timestamps + end + end +end diff --git a/db/migrate/20191008181751_create_trips.rb b/db/migrate/20191008181751_create_trips.rb new file mode 100644 index 000000000..4850ee892 --- /dev/null +++ b/db/migrate/20191008181751_create_trips.rb @@ -0,0 +1,13 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.date :date + t.float :cost + t.integer :rating + t.integer :passenger_id + t.integer :driver_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1a34bf58e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,45 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_10_08_181751) 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.string "make" + t.string "model" + t.boolean "active" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phone_num" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.date "date" + t.float "cost" + t.integer "rating" + t.integer "passenger_id" + t.integer "driver_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end 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/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 48aef7556..b22b067c7 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -2,174 +2,173 @@ describe DriversController do # Note: If any of these tests have names that conflict with either the requirements or your team's decisions, feel empowered to change the test names. For example, if a given test name says "responds with 404" but your team's decision is to respond with redirect, please change the test name. - + describe "index" do it "responds with success when there are many drivers saved" do - # Arrange - # Ensure that there is at least one Driver saved - - # Act - - # Assert - - end - - it "responds with success when there are no drivers saved" do - # Arrange - # Ensure that there are zero drivers saved - - # Act - - # Assert - + get drivers_path + + must_respond_with :success end end - + describe "show" do - it "responds with success when showing an existing valid driver" do - # Arrange - # Ensure that there is a driver saved - - # Act - - # Assert - + it 'responds with a success when id given exists' do + valid_driver = Driver.create(name: "Ada Lovelace", vin: 5035699987, make: "toyota", model: "prius", active: true) + get driver_path(valid_driver.id) + must_respond_with :success end - + + it "responds with 404 with an invalid driver id" do - # Arrange - # Ensure that there is an id that points to no driver - - # Act - - # Assert - + get driver_path("5000") + must_respond_with :not_found end end - + describe "new" do it "responds with success" do + get new_driver_path + must_respond_with :success end end - + describe "create" do it "can create a new driver with valid information accurately, and redirect" do # Arrange # Set up the form data - - # Act-Assert - # Ensure that there is a change of 1 in Driver.count - - # Assert - # Find the newly created Driver, and check that all its attributes match what was given in the form data - # Check that the controller redirected the user - - end - - it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do - # Note: This will not pass until ActiveRecord Validations lesson - # Arrange - # Set up the form data so that it violates Driver validations - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Check that the controller redirects - + driver_hash = { + driver: { + name: "ada lovelace", + vin: "2342334234242", + make: "toyota", + model: "prius" + } + } + expect { + post drivers_path, params: driver_hash + }.must_differ 'Driver.count', 1 + must_redirect_to drivers_path end end + # xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do + # # Note: This will not pass Until ActiveRecord Validations lesson + # # Arrange + # # Set up the form data so that it violates Driver validations + + # # Act-Assert + # # Ensure that there is no change in Driver.count + + # # Assert + # # Check that the controller redirects + + # end + + describe "edit" do + #this is being a butthead + #get form only it "responds with success when getting the edit page for an existing, valid driver" do # Arrange - # Ensure there is an existing driver saved - + # Ensure there is an existing driver save # Act - + get edit_driver_path(Driver.first.id) # Assert - + must_respond_with :success end - + it "responds with redirect when getting the edit page for a non-existing driver" do # Arrange # Ensure there is an invalid id that points to no driver - + driver_id = -1 # Act - + get edit_driver_path(driver_id) # Assert - + must_respond_with :redirect end end - + describe "update" do - it "can update an existing driver with valid information accurately, and redirect" do - # Arrange - # Ensure there is an existing driver saved - # Assign the existing driver's id to a local variable - # Set up the form data - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Use the local variable of an existing driver's id to find the driver again, and check that its attributes are updated - # Check that the controller redirected the user - + before do + @valid_driver = Driver.create(name: "Ada Lovelace", vin: "234834978", make: "Toyota", model: "Prius") end - - it "does not update any driver if given an invalid id, and responds with a 404" do - # Arrange - # Ensure there is an invalid id that points to no driver - # Set up the form data - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Check that the controller gave back a 404 - - end - - it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do - # Note: This will not pass until ActiveRecord Validations lesson - # Arrange - # Ensure there is an existing driver saved - # Assign the existing driver's id to a local variable - # Set up the form data so that it violates Driver validations - - # Act-Assert - # Ensure that there is no change in Driver.count - + it "updates an existing driver successfully and redirects to home" do + existing_driver = Driver.first + updated_driver_hash = { + driver: { + name: "Bill Gates", + vin: "234834978", + make: "Toyota", + model: "Prius" + } + } + expect { + patch driver_path(existing_driver.id), params: updated_driver_hash + }.wont_change 'Driver.count' # Assert - # Check that the controller redirects - + expect( Driver.find_by(id: existing_driver.id).name ).must_equal "Bill Gates" + expect( Driver.find_by(id: existing_driver.id).vin ).must_equal "234834978" + expect( Driver.find_by(id: existing_driver.id).make ).must_equal "Toyota" + expect( Driver.find_by(id: existing_driver.id).model ).must_equal "Prius" end end + + # this is being a butthead + it "does not update any driver if given an invalid id, and responds with a 404" do + driver_hash = { + driver: { + name: "ada lovelace", + vin: "2342334234242", + make: "toyota", + model: "prius" + } + } + invalid_id = -1 + + patch driver_path(invalid_id), params: driver_hash + must_respond_with :not_found + #{only if var changes or raises error} + end + + # xit "does not create a driver If the form data violates Driver validations, and responds with a redirect" do + # # Note: This will not pass Until ActiveRecord Validations lesson + # # Arrange + # # Ensure there is an existing driver saved + # # Assign the existing driver's id to a local variable + # # Set up the form data so that it violates Driver validations + + # # Act-Assert + # # Ensure that there is no change in Driver.count + + # # Assert + # # Check that the controller redirects + # end +end - describe "destroy" do - it "destroys the driver instance in db when driver exists, then redirects" do - # Arrange - # Ensure there is an existing driver saved - - # Act-Assert - # Ensure that there is a change of -1 in Driver.count - - # Assert - # Check that the controller redirects - - end - - it "does not change the db when the driver does not exist, then responds with " do - # Arrange - # Ensure there is an invalid id that points to no driver - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Check that the controller responds or redirects with whatever your group decides - - end +describe "destroy" do + it "destroys the driver instance in db when driver exists, then redirects" do + # Arrange + # Ensure there is an existing driver saved + new_driver = Driver.create(name: "Bill Gates", vin: "234834978", make: "Toyota", model: "Prius") + # Act-Assert + #Ensure that there is a change of -1 in Driver.count + expect {delete driver_path(new_driver.id)}.must_differ 'Driver.count', -1 + # Assert + # Check that the controller redirects + must_respond_with :redirect + must_redirect_to drivers_path end + + # xit "does not change the db when the driver does not exist, then responds with " do + # # Arrange + # # Ensure there is an invalid id that points to no driver + + # # Act-Assert + # # Ensure that there is no change in Driver.count + + # # Assert + # # Check that the controller responds or redirects with whatever your group decides + + # end end + diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 9dd7648db..cef86edea 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,9 +1,7 @@ require "test_helper" describe HomepagesController do - it "can get the homepage" do - get root_path - - must_respond_with :success - end + # it "does a thing" do + # value(1+1).must_equal 2 + # end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 60acbdfb6..4cef98f02 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,31 +1,131 @@ require "test_helper" describe PassengersController do + let (:passenger) { + Passenger.create name: "Johnny Appleseed", phone_num: "541-433-7865" + } + describe "index" do - # Your tests go here + + it "gives back a successful response" do + + get passengers_path + must_respond_with :success + + end + end - + describe "show" do - # Your tests go here + + it 'responds with a success when id given exists' do + + valid_passenger = Passenger.create(name: "Ada Lovelace", phone_num: "503-569-9987") + + get passenger_path(valid_passenger.id) + must_respond_with :success + + end + + it 'responds with a not_found when id given does not exist' do + + get passenger_path("5000") + must_respond_with :not_found + + end + end - + describe "new" do - # Your tests go here + it "gives back a successful response" do + + get new_passenger_path + must_respond_with :success + + end end - + describe "create" do - # Your tests go here + + it 'creates a new passenger successfully with valid data, and redirects the user to the passenger page' do + + passenger_hash = { + passenger: { + name: "Ada Lovelace", + phone_num: "503-569-9987" + } + } + + expect { + post passengers_path, params: passenger_hash + }.must_differ 'Passenger.count', 1 + + must_redirect_to passengers_path + end + end - + describe "edit" do - # Your tests go here + it "can get the edit page for an existing task" do + #skip + # Your code here + get edit_passenger_path(passenger.id) + must_respond_with :success + end + + it "will respond with redirect when attempting to edit a nonexistant task" do + #skip + # Your code here + get edit_passenger_path(9999) + must_respond_with :not_found + end end - + describe "update" do - # Your tests go here + before do + @valid_passenger = Passenger.create(name: "Ada Lovelace", phone_num: "503-569-9987") + end + + it "updates an existing passenger successfully and redirects to home" do + + existing_passenger = Passenger.first + + updated_passenger_hash = { + passenger: { + name: "Bill Gates", + phone_num: "541-569-9987" + } + } + + expect { + patch passenger_path(existing_passenger.id), params: updated_passenger_hash + }.wont_change 'Passenger.count' + + # Assert + expect( Passenger.find_by(id: existing_passenger.id).name ).must_equal "Bill Gates" + expect( Passenger.find_by(id: existing_passenger.id).phone_num ).must_equal "541-569-9987" + end end - + describe "destroy" do - # Your tests go here + + it 'deletes a new passenger successfully with valid data, and redirects the user to the passengers page' do + + passenger_hash = { + passenger: { + name: "Ada Lovelace", + phone_num: "503-569-9987" + } + } + + post passengers_path, params: passenger_hash + identifier = Passenger.find_by(name: "Ada Lovelace") + + expect { + delete passenger_path(identifier.id) + }.must_differ 'Passenger.count', -1 + + must_redirect_to passengers_path + end end end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 59455c041..dcf689ff5 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -1,23 +1,126 @@ require "test_helper" describe TripsController do + before do + @sample = Trip.create date: Time.now, passenger_id: 1, driver_id: 1, cost: 5, rating: nil + end + describe "show" do - # Your tests go here + it 'responds with a success when id given exists' do + + valid_trip = Trip.create(date: Time.now, passenger_id: 1, driver_id: 1, rating: nil, cost: 5) + + get trips_path(valid_trip.id) + must_respond_with :success + + end + + it 'responds with a not_found when id given does not exist' do + + get trip_path("-1") + must_respond_with :not_found + + end end - + describe "create" do - # Your tests go here + it 'creates a new trip successfully with valid data, and redirects the user to the passenger page' do + + trip_hash = { + trip: { + date: Time.now, + passenger_id: 1, + driver_id: 1, + cost: 5 + } + } + + expect { + post trips_path, params: trip_hash + }.must_change "Trip.count", 1 + + must_redirect_to trips_path + end end - + describe "edit" do - # Your tests go here + + it "will respond with redirect when attempting to edit a nonexistant trip" do + #skip + # Your code here + get edit_trip_path("9999999999") + must_respond_with :not_found + end end - + describe "update" do # Your tests go here + before do + rider = Passenger.new(name: "Lila Keating", phone_num: "431-309-4939") + rider2 = Passenger.new(name: "Granny Smith", phone_num: "455-789-9988") + taxi = Driver.new(name: "Dale Masters", vin: "456567678") + taxi2 = Driver.new(name: "Grumpy Frank", vin: "1000678") + valid_trip = Trip.create(date: Time.now, passenger_id: rider[:id], driver_id: taxi[:id], rating: nil, cost: 1) + end + # Note: If there was a way to fail to save the changes to a trip, that would be a great + # thing to test. + + it "updates an existing trip successfully and redirects to home" do + + rider = Passenger.new(name: "Lila Keating", phone_num: "431-309-4939") + rider2 = Passenger.new(name: "Granny Smith", phone_num: "455-789-9988") + taxi = Driver.new(name: "Dale Masters", vin: "456567678") + taxi2 = Driver.new(name: "Grumpy Frank", vin: "1000678") + valid_trip = Trip.create(date: Time.now, passenger_id: rider[:id], driver_id: taxi[:id], rating: nil, cost: 1) + + updated_trip_hash = { + trip: { + date: Time.now, + passenger_id: rider2[:id], + driver_id: taxi2[:id], + cost: 5 + } + } + + expect { + patch trip_path(valid_trip[:id]), params: updated_trip_hash + }.wont_change 'Trip.count' + + # Assert + expect( Trip.find_by(id: existing_trip.id).passenger_id ).must_equal 1 + expect( Trip.find_by(id: existing_trip.id).driver_id ).must_equal 1 + end + + + it "will redirect to the root page if given an invalid id" do + get trip_path("5000") + must_respond_with :not_found + end end - + describe "destroy" do # Your tests go here + it 'deletes a new trip successfully with valid data, and redirects the user to the trip page' do + + trip_hash = { + trip: { + date: Time.now, + passenger_id: 1, + driver_id: 1, + cost: 5 + } + } + + post trips_path, params: trip_hash + identifier = Trip.first + + expect { + delete trip_path(identifier.id) + }.must_differ 'Trip.count', -1 + + must_redirect_to trips_path + 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/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/models/driver_test.rb b/test/models/driver_test.rb index 9f12d286c..37374c325 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -3,78 +3,79 @@ 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 - new_driver.save - driver = Driver.first - [:name, :vin, :active, :car_make, :car_model].each do |field| - + car_make: "Cherry", car_model: "DR5") + } + it "can be instantiated" do # Assert - expect(driver).must_respond_to field + expect(new_driver.valid?).must_equal true end - end - - describe "relationships" do - it "can have many trips" do + + it "will have the required fields" do # Arrange new_driver.save driver = Driver.first - - # Assert - expect(driver.trips.count).must_be :>=, 0 - driver.trips.each do |trip| - expect(trip).must_be_instance_of Trip + [:name, :vin, :active, :car_make, :car_model].each do |field| + + # Assert + expect(driver).must_respond_to field 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 + + describe "relationships" do + it "can have many trips" do + # Arrange + new_driver.save + 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 "can go online" do - # Your code here + + 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 - - describe "can go offline" do - # Your code here + + # 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 - - # You may have additional methods to test end -end + \ No newline at end of file diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index 66ac353d3..a077b540e 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -1,31 +1,31 @@ require "test_helper" - +​ describe Passenger do let (:new_passenger) { - Passenger.new(name: "Kari", phone_number: "111-111-1211") + Passenger.new(name: "Kari", phone_num: "111-111-1211") } it "can be instantiated" do # Assert expect(new_passenger.valid?).must_equal true end - + ​ it "will have the required fields" do # Arrange new_passenger.save passenger = Passenger.first - [:name, :phone_number].each do |field| - + [:name, :phone_num].each do |field| + ​ # Assert expect(passenger).must_respond_to field end end - + ​ describe "relationships" do it "can have many trips" do # Arrange new_passenger.save passenger = Passenger.first - + ​ # Assert expect(passenger.trips.count).must_be :>, 0 passenger.trips.each do |trip| @@ -33,38 +33,38 @@ 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 - + new_passenger.phone_num = 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"] + expect(new_passenger.errors.messages).must_include :phone_num + expect(new_passenger.errors.messages[:phone_num]).must_equal ["can't be blank"] end end - + ​ # Tests for methods you create should go here describe "custom methods" do describe "request a ride" do # Your code here end - + ​ describe "complete trip" do # Your code here end # You may have additional methods to test here end -end +end \ No newline at end of file diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 0b0b2da32..57127f1ae 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -4,19 +4,19 @@ 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 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..5dd55fa02 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,14 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require 'minitest/rails' +require 'minitest/autorun' +require 'minitest/reporters' + + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # 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