Code

Branches, Angele and Kristy#20

Code

Open

kristyh32 wants to merge 56 commits intoAda-C12:masterAda-C12/ride-share-rails:masterfrom kristyh32:masterkristyh32/ride-share-rails:masterCopy head branch name to clipboard

+2,632-102

Commits

Commits on Oct 7, 2019

• set up structure of models, controllers, and routes, added passenger index page and controller method

  kristyh32

  committed
  fa1d6fe

Commits on Oct 8, 2019

• added Homepage controller and index view

  kristyh32

  committed
  aee3ba0

• added validation to driver model

  kristyh32

  committed
  37af13d

• added Passengers controller actions show, new, edit, update, create, and delete

  kristyh32

  committed
  ab0f8d8

• added show page for Passengers

  kristyh32

  committed
  47aaed1

• created edit and new pages for passenger

  kristyh32

  committed
  5050889

• added to passenger index view and added realtionships to Trips

  kristyh32

  committed
  74aee6a

• wrote migration to allow passengers to be deleted without deleting trips

  kristyh32

  committed
  379df7b

Commits on Oct 9, 2019

• added driver index to view, controller, and test, updated test_helper and added root to homepage index to routes.db

  geli-gel

  committed
  4f929aa

• updated driver show action, view, and tests

  geli-gel

  committed
  ce34fc6

• added create and driver_params to controller, set up corresponding new view and made tests

  geli-gel

  committed
  3a31f76

• added edit action, tests, and partial form render for both edit and new

  geli-gel

  committed
  4684c72

• added update and destroy actions, added update tests, still need to test destroy action

  geli-gel

  committed
  557dcba

• amended nested routes

  kristyh32

  committed
  975a92c

• Merge branch 'drivers_basics' drivers basics complete

  kristyh32

  committed
  23945d0

• added minitest to test helper

  kristyh32

  committed
  11d89fd

• updated passenger_test.rb for phone number inconsistencies

  geli-gel

  committed
  2b02099

• Drivers can see their trips from show page

  geli-gel

  committed
  3db9593

• deleted car_make and car_model from driver_test.rb

  geli-gel

  committed
  e8b98ee

• made Passenger controller test and passed

  kristyh32

  committed
  61f589a

• Merge branch 'master' of https://github.com/kristyh32/ride-share-rails

  kristyh32

  committed
  a41bb6c

• finished drivers_controller_test

  geli-gel

  committed
  b4fca46

• added pseudocode for trips

  kristyh32

  committed
  70e7d4e

• added trips controller actions index, show, new, create

  kristyh32

  committed
  4b0f58f

Commits on Oct 10, 2019

• commented out validation tests for driver and passenger since Jared said we will go into that next week

  geli-gel

  committed
  66c0afc

• added driver active boolean column, default false

  geli-gel

  committed
  738ed0e

• Driver toggle_active working in 'show' view

  geli-gel

  committed
  7b08cd1

• JK I was wrong about commenting out those validation tests - fixed it

  geli-gel

  committed
  21f886b

• updated passenger_test.rb 'relationships' per Jared's tips

  geli-gel

  committed
  9c39a55

• changed driver toggle_active to redirect instead of render

  geli-gel

  committed
  c48f62a

Commits on Oct 11, 2019

• added missing </section> tag to driver#show view

  geli-gel

  committed
  3ec3382

• passenger can request trips and it is added to both driver and passenger's trip lists, however passenger instance is not associated with trip -- need to figure out how to fix!!

  geli-gel

  committed
  c2df365

• added table to passenger page

  kristyh32

  committed
  982c660

• added links to driver and passenger trip tables

  kristyh32

  committed
  ccd3599

• added link to homepage

  kristyh32

  committed
  11d25c9

• removed passenger name from trip#show for now, trying to make create trip from passenger work

  geli-gel

  committed
  87c943b

• modified alltrips method

  kristyh32

  committed
  d1a3df1

• on our way!!

  geli-gel

  committed
  916841c

• This is really close

  kristyh32

  committed
  61674b0

• so close

  geli-gel

  committed
  c6cf499

• added destroy action to trips controller

  kristyh32

  committed
  2823ed1

• fixed destroy method for Trips controller and wrote tests

  kristyh32

  committed
  8d0c446

• Can edit/update Trip from its show page

  geli-gel

  committed
  97e014c

• merged update and destroy in trips controller

  geli-gel

  committed
  5b44109

• fixed trip show issues

  kristyh32

  committed
  c0650e7

• fixed merge conflict

  kristyh32

  committed
  2b1142e

• made trips controller tests and passed

  kristyh32

  committed
  dea8424

• can rate trips

  geli-gel

  committed
  bcb6023

• working on nav bar - in progress

  geli-gel

  committed
  c32a2c9

• added some css

  kristyh32

  committed
  372a2a4

• fixed merge issues

  kristyh32

  committed
  6a8cd3e

• added additional css

  kristyh32

  committed
  d741176

• adding nav css

  geli-gel

  committed
  9728932

• merged css changes

  geli-gel

  committed
  c452a0f

• added more css

  kristyh32

  committed
  8d4535a

• updated passenger and driver index pages

  geli-gel

  committed
  d2e31d3