Code

Branches- Dora & Mac (MacDora) #15

Code

Open

mdove92 wants to merge 62 commits intoAda-C12:masterAda-C12/ride-share-rails:masterfrom mdove92:mastermdove92/ride-share-rails:masterCopy head branch name to clipboard

+10,655-75

Commits

Commits on Oct 7, 2019

• Created projects files. Added Passengers, Trips, Drivers, Homepage controllers and routes.

  

  [email protected]

  committed
  621ac3b

• Added driver, passenger, and trip models. Added foreign keys to trips

  

  [email protected]

  committed
  892031d

Commits on Oct 8, 2019

• Added minitest requirements to test helper. Added relationships between trips and passengers/driver.

  

  [email protected]

  committed
  45755ba

• Drivers and Passengers #index, #show and respective html.erb files created and functional

  dora1405

  committed
  33a900c

• Trip#show created and show.html.erb functional

  dora1405

  committed
  e73e915

• added new passenger and new driver methods with matching views

  

  [email protected]

  committed
  175b58d

• Oops - added the actions for new passenger this time

  

  [email protected]

  committed
  012a87e

• Added Passenger and Driver view for Edit action and added edit actions to Driver and Passenger

  

  [email protected]

  committed
  9d522ff

• Added some validation for passengers and drivers

  

  [email protected]

  committed
  31ec669

• Added error messages to validation for Driver and Passenger forms

  

  [email protected]

  committed
  fd5719f

• Changed passenger test so that phone_number matched our defined attribute of phone_num

  

  [email protected]

  committed
  8e39535

• Changed passenger test so that phone_number matched our defined attribute of phone_num

  

  [email protected]

  committed
  f4987ff

• Created delete action for driver and passenger and added delete and edit buttons to their views

  

  [email protected]

  committed
  3d0ccd8

• Added columns for drivers table

  dora1405

  committed
  cb99e03

• updated params for drivers and passengers update function

  dora1405

  committed
  c68d4f1

• Add link for creating new driver and passenger. Updated redirect for successful creation of new driver and passenger.

  dora1405

  committed
  fe2ee7f

• updated driver's new and edit form to add in additional columns

  dora1405

  committed
  b485755

• Changed the driver and passenger validations to be more general. Passing all Passenger tests except for the one about having trips

  

  [email protected]

  committed
  4a508af

• Working on drivers controller test

  dora1405

  committed
  c82c160

• attempted to add simplecov. Added methods into driver models to count a driver's rides and find average rating

  

  [email protected]

  committed
  8b8c77a

• Merge branch 'mac_test_edits'

  

  [email protected]

  committed
  5388a3f

Commits on Oct 9, 2019

• Added drivers controller tests

  dora1405

  committed
  67dfc3e

• Added passengers controller tests. Need to write tests for drivers and passengers controller for render _path

  dora1405

  committed
  8f14bef

• Updated trips routes

  dora1405

  committed
  16ffc17

• Adjusted driver model methods

  

  [email protected]

  committed
  3729cf2

• Adding drivers&passengers controller #index tests

  dora1405

  committed
  6289890

• added table of all driver trips in driver show view

  

  [email protected]

  committed
  ad9dd6d

• added css formatting to all driver trips table

  

  [email protected]

  committed
  3d3a76f

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

  dora1405

  committed
  1c138e7

• updated routes to add trips

  dora1405

  committed
  b760669

• added links to trip show page from passenger show and driver show

  

  [email protected]

  committed
  0cb0933

• Added delete trip button to driver and passenger show tables

  

  [email protected]

  committed
  8ff890c

• Add trips controller CRUD and views

  dora1405

  committed
  b198903

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

  dora1405

  committed
  1fdccb5

• Added delete button to trips show page

  

  [email protected]

  committed
  65d1178

• Added driver and passenger details table to the show pages

  

  [email protected]

  committed
  54528a6

• Created total_earnings method for driver model

  

  [email protected]

  committed
  852de48

Commits on Oct 10, 2019

• updated instance variable in trips html

  dora1405

  committed
  805c5b9

• trips controller tests for #index, #show and #new completed and passed

  dora1405

  committed
  cf4e1bb

• added Driver Model toggle_active method and driver controller action for toggle and the corresponding routes

  

  [email protected]

  committed
  a1e8dd6

• Adjusted the driver test to match active status

  

  [email protected]

  committed
  83f2371

• added some lines for Trips#create controller test

  dora1405

  committed
  4dfea68

• Began writing tests for custom methods for Driver Model

  

  [email protected]

  committed
  41a3b6b

Commits on Oct 11, 2019

• Passenger can make new trip

  dora1405

  committed
  1556a2b

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

  dora1405

  committed
  470d729

• CSS for Homepage#index, Drivers#index and Passengers#index complete

  dora1405

  committed
  19c9adb

• homepage CSS final draft

  dora1405

  committed
  78508de

• drivers and passengers index page CSS final draft

  dora1405

  committed
  391353e

• CSS style added to drivers and passengers show page

  dora1405

  committed
  c7f16eb

• final draft completed for CSS

  dora1405

  committed
  4d1a1a0

• Added more model tests in driver and passenger for custom methods and adjusted models to pass tests.

  

  [email protected]

  committed
  1de357b

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

  

  [email protected]

  committed
  331d5e1

• Added trips controller routes to Create new trip without form. Adjusted create trip action to get first inactive driver.

  

  [email protected]

  committed
  d3dfc64

• Began passenger trip rating option in passenger show. Tried to add corresponding route with no success

  

  [email protected]

  committed
  9189f64

• Made rate trip method for passengers that changes driver's active status

  

  [email protected]

  committed
  e1252e8

• Added model test for count_rides and add templates dor passenger controller_test for custom methods

  

  [email protected]

  committed
  937746a

• COntinuing to add testing to passenger control and model

  

  [email protected]

  committed
  f4d0832

• Removed error in view for editing trip

  

  [email protected]

  committed
  3a299fb

• ADjusted passenger controller test for trip rating to have proper arrange and act

  

  [email protected]

  committed
  e882263

• css for trips

  

  [email protected]

  committed
  fb2ff4d

• Adjusted tests to remove errors

  

  [email protected]

  committed
  c868149

Commits on Oct 12, 2019

• Made edits to trips_contorller test to add testing for custom methods. COmmented out errored tests

  

  [email protected]

  committed
  63c4671