Fire - Ida Goitom and Earth - Christina Minh#10

Open

christinaminh wants to merge 89 commits intoAda-C14:masterfrom

christinaminh:master

Commits on Nov 3, 2020

Commits on Nov 4, 2020

Commits on Nov 5, 2020

Added nested route for passenger in routes.rb
christinaminh
committed
Fixed Trips index view. Changed TripsController#index with relationship to passenger
christinaminh
committed
Fixed trips _form.html.erb to have header
christinaminh
committed
updated driver's show view
idago123
committed
updated drivers show and index view
idago123
committed
Added belongs_to :passenger relationship in trip model. Changed trip show view
christinaminh
committed
cleaned up file
idago123
committed
Merge branch 'PassengerNestedRoutes'
christinaminh
committed
Removed old comments from trips/show.html.erb
christinaminh
committed
Changed trips/show.html.erb to address error when passenger or driver is deleted. If either is deleted, trips detail will display 'User account deleted'
christinaminh
committed
Added links to passenger and driver on trip details page trips/show.html.erb
christinaminh
committed
Added to TripsController to add new trip with assigned driver and no rating. Added dropdown menus for driver and passenger when creating new trip
christinaminh
committed
Changed links to driver and passenger. Added validations to trip.
christinaminh
committed
updated view for edit action to view error messages
idago123
committed
Added driver methods self.find_available_driver and toggle_status. Added trip methods self.default fields to return hash of default fields when creating new trip
christinaminh
committed
Added support for 'On the trip's detail page, I want to be able to assign a rating (1-5) to the trip, if it does not already have one'
christinaminh
committed
Add TripsController tests to test nested passenger paths. Added testing for toggling driver availability in TripController#create.
christinaminh
committed
Added TripsController#complete with custom route to allow user to complete trip and set driver availability to true
christinaminh
committed
Added TripsController#complete testing
christinaminh
committed
Added validations to Trip model
christinaminh
committed
updated trips show view to take care of the trips when a driver or passenger is deleted
idago123
committed
Merge branch 'master' of https://github.com/christinaminh/ride-share-rails
christinaminh
committed
updated driver model tests
idago123
committed
updated model tests
idago123
committed
updated tests
idago123
committed

Commits on Nov 6, 2020