Code

Leaves - Samantha & Yasmin#25

Code

Open

iamsammysam wants to merge 86 commits intoAda-C12:masterAda-C12/ride-share-rails:masterfrom iamsammysam:masteriamsammysam/ride-share-rails:masterCopy head branch name to clipboard

+2,425-261

Commits

Commits on Oct 7, 2019

• rails new

  iamsammysam

  committed
  f1dce7c

• created drivers and passengers controllers

  iamsammysam

  committed
  44aa542

• created schema for driver

  iamsammysam

  committed
  491c3b3

Commits on Oct 8, 2019

• created passenger schema

  iamsammysam

  committed
  9f60bc2

• created trip schema

  YasminM11

  committed
  a622bdd

• created homepage and add routes for passengers and homepage

  YasminM11

  committed
  db892f8

• changed the trip schema date from string to date

  YasminM11

  committed
  f481339

• updated views for passenger

  YasminM11

  committed
  d7080f1

• created methods for passengers_controller

  iamsammysam

  committed
  70be9e2

• created methods for drivers_controller

  YasminM11

  committed
  54ab413

• Create a new driver

  YasminM11

  committed
  5998a9f

• created a new passenger

  iamsammysam

  committed
  8807c61

• created a new passenger

  iamsammysam

  committed
  4a7ad62

Commits on Oct 9, 2019

• updated views and started creating tests

  iamsammysam

  committed
  be6591d

• created tests for passengers controller, tests pass

  iamsammysam

  committed
  8115722

• updated models to create relationship

  iamsammysam

  committed
  88fe825

• created total_earnings method and avg_rating method

  YasminM11

  committed
  e0ab99d

• updated trip schema to create relationships

  iamsammysam

  committed
  e758e92

• added a total_earnings and added avg_rating methods

  YasminM11

  committed
  b0760f1

• updating relationships

  iamsammysam

  committed
  2d73378

Commits on Oct 10, 2019

• creating total_amount method for passenger

  iamsammysam

  committed
  da7a236

• total earnings

  YasminM11

  committed
  1f30dd4

• fixed bugs on passenger_test.rb

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  e70a661

• created method total_amount_charged at passenger model

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  4e2b59d

• addded css

  YasminM11

  committed
  5828c80

• created models/driver.rb

  YasminM11

  committed
  49061ac

• created a method to create trips on trip_controller

  iamsammysam

  committed
  d93653a

• created route/updated models for method create_a_trip on trip_controller

  iamsammysam

  committed
  19f59bc

• created trip_controller

  YasminM11

  committed
  8db9865

• made method create_a_trip on trip_controller.rb

  iamsammysam

  committed
  d26e862

• created method for finding_driver at driver.rb model

  iamsammysam

  committed
  be930e3

Commits on Oct 11, 2019

• fixed driver.rb test following slack intructions

  iamsammysam

  committed
  2b87d81

• fixed tests acording to slack, all tests pass

  iamsammysam

  committed
  8227b52

• created find_driver method, updated view to show trips and route

  iamsammysam

  committed
  12bbf0e

• created a call ride button in the passger view

  YasminM11

  committed
  0549a85

• updated driver schema to add availabity status

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  a92a1b4

• created a call ride button in the passger view

  YasminM11

  committed
  e5b3e01

• updated method total_amount_charged

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  115a260

• updated method find_a_driver and created_trip, created a trip

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  64fd980

• adjusting logic to request a trip

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  73c8dc9

• updated driver_test.rb to test available not active

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  374a3fe

• updated passenger view to show total expenses

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  920a42b

• updated path after creating a trip

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  5df6308

• updated driver view to show total_earning and avg_rating

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  588015c

• updated passenger show view

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  236774f

• started working on the trip view

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  eb06264

• updated views for drivers and passengers

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  5903bd7

• updating views

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  fab05c2

• refactoring

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  15ea4eb

• refactoring

  iamsammysam

  committed
  e233987

• merging conflicts

  iamsammysam

  committed
  941d166

• deploying heroku

  iamsammysam

  committed
  d2c3af2

• updated the driver model

  YasminM11

  committed
  03f7200

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

  YasminM11

  committed
  b5fe126

• fixed bugs on drivers, trips, passengers views

  iamsammysam

  committed
  9006a07

• updated trip view to show details to both drivers and passengers

  iamsammysam

  committed
  9b2ff96

• updated trip view to show details to both drivers and passengers

  iamsammysam

  committed
  1b662e1

• fixed bugs and finished passanger_controller tests, all pass

  iamsammysam

  committed
  ad2e2aa

• fixed bug on driver model total_cost

  iamsammysam

  committed
  90da7ff

• added update test in the driver controller test

  YasminM11

  committed
  fbb262a

• added update test in the driver controller test

  YasminM11

  committed
  b54fe12

• fixed bug in avg_rating method in driver model

  iamsammysam

  committed
  fe51e26

Commits on Oct 12, 2019

• added to trips_controller_test

  YasminM11

  committed
  fa29775

• added trip controller tests

  YasminM11

  committed
  2860d40

• fixing merging conflicts

  YasminM11

  committed
  14e67d6

• uptating driver controller tests

  iamsammysam

  committed
  e7bf227

• added to application.html.erb

  YasminM11

  committed
  a94252b

• fixing merging conflicits

  iamsammysam

  committed
  02e3354

• testing

  iamsammysam

  committed
  e69be44

• made small change on html footer

  iamsammysam

  committed
  2c5ac14

• fixed bugs and created more tests for driver_controller

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  7829287

• fixed model passenger_test, added test for total_amount_charged

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  e5073ee

• fixed model passenger_test, added test for total_amount_charged, all pass

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  487ef07

• fixed bugs at existing driver model tests and created avg_rating test, all pass

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  3d3fc4d

Commits on Oct 13, 2019

• added edge case on avg_rating method

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  cf9612e

• added validations

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  fdfd11d

• added driver status on driver view

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  6f70b94

• added edge case for amount_charged

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  ad63066

• created logic to change driver status when on a trip

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  21beab8

• minor refactoring

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  6963df6

• finished driver controller tests, all pass

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  f8be2e2

• minor refactoring on driver model

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  935fcaf

• finished driver model tests, all pass

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  afb9c3d

• minor changes on find_driver and create_trip methods

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  ba48ed7

• fixed bugs on models and trip controller

  

  Samantha Coll

  authored and

  Samantha Coll

  committed
  d0657fa

Commits on Oct 15, 2019

• final refactoring, all tests pass

  iamsammysam

  committed
  e1c9dd3