Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
07ba0a5
Initial commit.
minipaige02 Oct 7, 2019
649c169
Added trip model
minipaige02 Oct 7, 2019
02a3f2e
Create Passenger and Driver Models and modify Trip model to use them …
tofuandeve Oct 7, 2019
91ae45f
Updated seed.rb to convert cost to float.
minipaige02 Oct 8, 2019
935529b
Added car make, car model, and active fields to Drivers.
minipaige02 Oct 8, 2019
2cc744b
Update passenger_test.rb: replace phone_number with phone_num
tofuandeve Oct 8, 2019
252ac5a
Create Drivers, Passengers and Trips controllers
tofuandeve Oct 8, 2019
4d41b90
Include js files to assets
tofuandeve Oct 8, 2019
91c373f
Add routes, tests and implementation for Drivers#index action
tofuandeve Oct 8, 2019
f87de0d
Add tests and view and implementation for Drivers#show action
tofuandeve Oct 8, 2019
368a383
Added new and create Driver actions, tests, and view.
minipaige02 Oct 8, 2019
42d7f82
Add input validation test for drivers#create action
tofuandeve Oct 8, 2019
02b98cc
Merge pull request #1 from tofuandeve/driver_validation
tofuandeve Oct 8, 2019
8cfcffb
Added test, view, and implementation for Driver edit action.
minipaige02 Oct 8, 2019
3901a06
Merge pull request #2 from tofuandeve/driver_edit
minipaige02 Oct 8, 2019
9471ca6
Added tests and implementation for update action.
minipaige02 Oct 9, 2019
8d0762c
Edited routes to nest Trips new and index actions for Passengers and …
minipaige02 Oct 9, 2019
7cf5e86
Added Trips show action, tests, and view.
minipaige02 Oct 9, 2019
74e3488
Changed routes so only Passengers has nested trip routes.
minipaige02 Oct 9, 2019
fa11167
Changed routes so only Drivers also has nested Trips index action
minipaige02 Oct 9, 2019
66ea504
Add tests and implementation for drivers#delete action
tofuandeve Oct 9, 2019
7a4726b
Add tests and view and implementation for passengers#index action
tofuandeve Oct 9, 2019
b54297a
Add tests, view and implementation for passengers#show action
tofuandeve Oct 9, 2019
c49dfb7
Add test, view and implementation for passengers#new
tofuandeve Oct 9, 2019
d456971
Add tests and implementation for passengers#create
tofuandeve Oct 9, 2019
3612f22
Beginning of Trip create action and edited routes.
minipaige02 Oct 9, 2019
241e897
Made updates from review.
minipaige02 Oct 9, 2019
60fd1ab
Merge pull request #3 from tofuandeve/driver_update_action
minipaige02 Oct 9, 2019
55a4cc0
Merged with master branch.
minipaige02 Oct 9, 2019
dd03d0b
Merge with updated master
tofuandeve Oct 9, 2019
8ecb9b3
Update test name for drivers#destroy
tofuandeve Oct 9, 2019
21f8a29
Merge pull request #4 from tofuandeve/driver_controller_destroy
tofuandeve Oct 9, 2019
8dec0ae
Merge branch 'master' into trip_controller
minipaige02 Oct 9, 2019
b8747b2
Merge branch 'master' into passenger_controller
tofuandeve Oct 9, 2019
e916be2
Updated validation to include spaces in Driver name.
minipaige02 Oct 9, 2019
89ee37b
Updated Trip new and create actions and updated tests
minipaige02 Oct 9, 2019
6d80dd2
Made updates to tests and schema from class discussion.
minipaige02 Oct 9, 2019
4ad738e
Merge branch 'master' into trip_controller
minipaige02 Oct 9, 2019
b742e5a
Merge branch 'master' into passenger_controller
tofuandeve Oct 9, 2019
c35fc70
Add comment on setting driver_id to nil to all trips of a driver in d…
tofuandeve Oct 9, 2019
fbdc106
Add tests and implement average_rating in Driver model
tofuandeve Oct 9, 2019
5123ef3
Added total earnings for Driver model method and tests.
minipaige02 Oct 9, 2019
e79ff60
Add tests and implementation for toggle_complete in Driver model
tofuandeve Oct 9, 2019
0c11519
Updated total earnings calculation and tests and revised driver contr…
minipaige02 Oct 9, 2019
4784b25
Add uniqueness validation for driver vin
tofuandeve Oct 9, 2019
e1bcc6e
Added Homepages controller, index, and view to pass homepages test.
minipaige02 Oct 10, 2019
1d98a71
Created Trip index method and view with functionality to support pass…
minipaige02 Oct 10, 2019
3c753ba
Updated Trip show view to display trip details with links to passenge…
minipaige02 Oct 10, 2019
66009a7
Added trip edit action, view, and tests.
minipaige02 Oct 10, 2019
0f53347
Updated Trip create action tests.
minipaige02 Oct 10, 2019
7b4e0dc
Added trip model tests for instantiation and relationships.
minipaige02 Oct 10, 2019
1718f26
Add tests and implemented passengers#edit
tofuandeve Oct 10, 2019
9df665f
Merge with updated master
tofuandeve Oct 10, 2019
070f28c
Updated Trip update action, views, and tests.
minipaige02 Oct 10, 2019
537e0cf
Fix .gitignore
tofuandeve Oct 10, 2019
a7a8c7b
Add tests and implementation for passengers#update
tofuandeve Oct 10, 2019
10cd5f1
Fix .gitignore issue with simplecov report in coverage folder
tofuandeve Oct 10, 2019
494512d
Add tests and implementation for passengers#destroy
tofuandeve Oct 10, 2019
a432f81
Add views for drivers
tofuandeve Oct 10, 2019
3207c42
Merge pull request #6 from tofuandeve/fix_gitignore
tofuandeve Oct 10, 2019
b25404c
Merge with updated master
tofuandeve Oct 10, 2019
0c3a147
removed coverage files
minipaige02 Oct 10, 2019
7a80c4a
Merge pull request #5 from tofuandeve/homepage
minipaige02 Oct 10, 2019
e747cbd
Merge branch 'master' into driver_views
tofuandeve Oct 10, 2019
b3a1740
Update driver index file to link to root path
tofuandeve Oct 10, 2019
bb5276e
Update drivers controller to render and show error for invalid input
tofuandeve Oct 10, 2019
0c9f84d
Merge pull request #7 from tofuandeve/driver_views
tofuandeve Oct 10, 2019
9ff2e62
Merge branch 'master' into passenger_controller
tofuandeve Oct 10, 2019
1600b86
Update dependency of trips on passenger id
tofuandeve Oct 10, 2019
207289f
Merge pull request #8 from tofuandeve/passenger_controller
minipaige02 Oct 10, 2019
900055d
Update nullify dependency on driver for trips
tofuandeve Oct 10, 2019
fe19230
Updated details view to display text for if passenger or driver is ni…
minipaige02 Oct 10, 2019
727f9f4
merged with master branch
minipaige02 Oct 10, 2019
90dabce
Added tests for Trip destroy action.
minipaige02 Oct 10, 2019
0f054b0
Added Trip model tests and updated Passenger model test.
minipaige02 Oct 10, 2019
5571ff9
Add passengers views
tofuandeve Oct 10, 2019
5ec9b61
Remove unused code and update delete button for driver in show.html
tofuandeve Oct 10, 2019
9908bcc
updated Trip controller to render :new and updated rating validation …
minipaige02 Oct 10, 2019
adb240e
Merge branch 'master' into trip_controller
minipaige02 Oct 10, 2019
53a6dde
Merge pull request #9 from tofuandeve/trip_controller
tofuandeve Oct 10, 2019
340cbdf
Merge pull request #10 from tofuandeve/passenger_view
tofuandeve Oct 10, 2019
2c4d759
Display trips' ids in view
tofuandeve Oct 10, 2019
a1a33e0
Show data as tables
tofuandeve Oct 10, 2019
8c9aaa1
Revised Edit Trip page.
minipaige02 Oct 10, 2019
678d320
Updated Trip edit for to show error messages.
minipaige02 Oct 10, 2019
0e0ccaf
Merge pull request #11 from tofuandeve/trip_controller
minipaige02 Oct 10, 2019
b10f4df
Add test and implementation for total_expense for Passenger model
tofuandeve Oct 10, 2019
a322ce7
Merge branch 'master' into passenger_model
tofuandeve Oct 10, 2019
c03625c
Create add trip to trip_controller.rb
tofuandeve Oct 11, 2019
3e8bf31
Add request_trip to Passenger model and update TripControllers#create
tofuandeve Oct 11, 2019
437e438
Update tests for trip controller create to handle invalid input data
tofuandeve Oct 11, 2019
04a4cb6
Merge pull request #12 from tofuandeve/create_trip_passenger
minipaige02 Oct 11, 2019
f6cb1e6
Update passenger view to show total expense in dollar
tofuandeve Oct 11, 2019
1ef7ba8
Merge with updated master
tofuandeve Oct 11, 2019
4475285
Add tests and update request_trip in passenger
tofuandeve Oct 11, 2019
d54f74d
Add tests and implementation for drivers#toggle action
tofuandeve Oct 11, 2019
bf46046
Add test and implement complete action and update view to trip show p…
tofuandeve Oct 11, 2019
b15c0db
Update trip nested routes to allow create action and update passenger…
tofuandeve Oct 11, 2019
ccd403f
Update average_rating for Driver to handle trips without ratings
tofuandeve Oct 11, 2019
f174d6f
Added CSS and edited views.
minipaige02 Oct 11, 2019
495a82d
Refactored Trip create function.
minipaige02 Oct 11, 2019
6be5cb7
Update trips#new and trips#create action
tofuandeve Oct 11, 2019
8c727ca
Merge with master
tofuandeve Oct 11, 2019
8dc1001
Merge pull request #13 from tofuandeve/passenger_model
tofuandeve Oct 11, 2019
4b26260
Merge with master
tofuandeve Oct 11, 2019
11694a1
Merge pull request #14 from tofuandeve/driver_toggle_action
tofuandeve Oct 11, 2019
a0bee45
Merge with master
tofuandeve Oct 11, 2019
c7adf0a
Merge pull request #15 from tofuandeve/complete_trip
tofuandeve Oct 11, 2019
741e3c9
Added CSS changes and merged with branch.
minipaige02 Oct 11, 2019
3552b6d
Final CSS edits.
minipaige02 Oct 11, 2019
eeb1de9
Update trip create and test
tofuandeve Oct 11, 2019
7b205ac
MErge with master
tofuandeve Oct 11, 2019
f185e31
Updated homepage image
minipaige02 Oct 11, 2019
f57ed34
Revised image for heroku
minipaige02 Oct 11, 2019
53d3e2f
Revised homepage image file path
minipaige02 Oct 11, 2019
42bbbbd
Test image added for heroku
minipaige02 Oct 11, 2019
5bdde94
Revised image path for homepage
minipaige02 Oct 11, 2019
ade48cb
revised homepage.
minipaige02 Oct 11, 2019
85dd40d
trying to make heroku work
minipaige02 Oct 11, 2019
3b9718f
Still trying to get heroku to display images
minipaige02 Oct 11, 2019
512a094
Heroku still...
minipaige02 Oct 11, 2019
c32355a
Heroku image..
minipaige02 Oct 11, 2019
ef2d646
Edited image link again.
minipaige02 Oct 11, 2019
2d8b7a6
Image updated again
minipaige02 Oct 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 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

# Ignore simplecov and test data in simplecov report
/coverage.data
/coverage
.DS_Store


# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.5
84 changes: 84 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
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'
gem 'simplecov', require: false
end
Loading