Code

Branches - Sara and Linnea#23

Code

Open

llinneaa wants to merge 96 commits intoAda-C12:masterAda-C12/ride-share-rails:masterfrom llinneaa:masterllinneaa/ride-share-rails:masterCopy head branch name to clipboard

+2,829-191

Commits

Commits on Oct 7, 2019

• Set up controllers, models, migrations, routes, and passenger index.html.erb

  llinneaa

  committed
  6fd9eb9

Commits on Oct 8, 2019

• Added Homepages controller and index.html.erb page

  llinneaa

  committed
  5eecab2

• added views to driver and trip

  llinneaa

  committed
  935bb42

• changed root path to homepages controller path

  llinneaa

  committed
  dceacd4

• updated models, added migration to fix foreign key to make it optional

  llinneaa

  committed
  d45b6ef

• FixDriverTripsForeignKey added on migration

  sarashahbaig

  committed
  befe352

• data loaded by seed

  sarashahbaig

  committed
  287c2e9

• Seeded database, added passengers show page

  llinneaa

  committed
  1179b31

• added actions to passengers_controller, created form partial and new and edit forms

  llinneaa

  committed
  fe429ee

• edit,update and create updated got the driver file

  sarashahbaig

  committed
  af05964

Commits on Oct 9, 2019

• homepage and css edited

  sarashahbaig

  committed
  fe914ec

• added new driver form

  sarashahbaig

  committed
  5b37d6a

• updated drivers route

  sarashahbaig

  committed
  463e356

• update driver controller to add driver and edit driver

  sarashahbaig

  committed
  abfa827

• update driver show html

  sarashahbaig

  committed
  438dc58

• added normalize.css and font-awesome

  sarashahbaig

  committed
  3c0acf5

• updated styles

  sarashahbaig

  committed
  eff84ed

• update homepage

  sarashahbaig

  committed
  db14bc4

• update driver views for styling

  sarashahbaig

  committed
  d674317

• update drivers controller

  sarashahbaig

  committed
  c4f4b54

• added passenger controller tests

  llinneaa

  committed
  2e4618c

• routes updated

  sarashahbaig

  committed
  3002546

• Merge branch 'passengers-branch' of https://github.com/llinneaa/ride-share-rails

  Show description for d3a3f6e
  llinneaa

  committed
  d3a3f6e

• main and class added to the formpage

  sarashahbaig

  committed
  43e59fb

• column added to migration

  sarashahbaig

  committed
  7cbfe50

• delete and edited btn added to index

  sarashahbaig

  committed
  ddc81b0

• refactored code for driver index,form and show

  sarashahbaig

  committed
  ed2ad04

• schema change

  llinneaa

  committed
  a8dd94e

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

  Show description for c534771
  llinneaa

  committed
  c534771

• test done for driver

  sarashahbaig

  committed
  12c6899

• merge complexity clear

  sarashahbaig

  committed
  a6bdc5f

Commits on Oct 10, 2019

• controller trip updated

  sarashahbaig

  committed
  01574df

• edit,show,new and form files added to trip

  sarashahbaig

  committed
  902fb15

• updated passengers styling to match drivers pages

  llinneaa

  committed
  cc2d43a

• Added trip controller index

  llinneaa

  committed
  63e2d4e

• code refactored

  sarashahbaig

  committed
  789ce93

• updated drivers controller

  sarashahbaig

  committed
  2b84692

• fixed trips controller

  sarashahbaig

  committed
  3aeaac4

• refactored code for form

  sarashahbaig

  committed
  58da00b

• fixed edit for driver

  sarashahbaig

  committed
  e0fdfcb

• fixed driver index

  sarashahbaig

  committed
  0304316

• updated new page for driver

  sarashahbaig

  committed
  72733a0

• update show for drivers

  sarashahbaig

  committed
  7b96612

• added form for trips

  sarashahbaig

  committed
  9becd6e

• added edit for trip

  sarashahbaig

  committed
  1b90cc1

• added index for trips

  sarashahbaig

  committed
  2e979d6

• code updated

  sarashahbaig

  committed
  829144d

• Decided trips index is probably not needed because we do not need to display all of the trips; may re-add later

  llinneaa

  committed
  2bce870

• Updated trips controller

  llinneaa

  committed
  a367360

• Merge branch 'passengers-branch'

  llinneaa

  committed
  ed79b08

• Added average rating method to driver model

  llinneaa

  committed
  34ad737

• Added total earnings method to driver model

  llinneaa

  committed
  7ed91d1

• Added total money spent method to passengers and updated view; need to validate

  llinneaa

  committed
  597bbdf

• refactored codes

  sarashahbaig

  committed
  1b13f8a

• codes updated

  sarashahbaig

  committed
  61090bf

• codes updated

  sarashahbaig

  committed
  b3496a7

• code edited

  sarashahbaig

  committed
  fe81f4b

• Merge pull request #1 from llinneaa/testmerge

  Show description for 2cc3b65
  sarashahbaig

  authored
  2cc3b65

• Reformatted cost in passengers, drivers, and trips show

  llinneaa

  committed
  8871036

• rounded average rating for driver

  llinneaa

  committed
  e436d5a

• new column added on migration

  sarashahbaig

  committed
  b42ab19

Commits on Oct 11, 2019

• column rename and request a trip updated

  sarashahbaig

  committed
  a5c55b2

• trips update

  sarashahbaig

  committed
  e22e4b2

• Fixed total earnings method in driver model, fixed table headers

  llinneaa

  committed
  1854cbd

• added validations, added trip controller tests, updated passenger tests, commented out driver tests because of deep stack

  llinneaa

  committed
  344fbc8

• fixing tests, deleted validation tests because of changing requirements for assignment

  llinneaa

  committed
  26e987e

• test code edited

  sarashahbaig

  committed
  921660a

• merged

  sarashahbaig

  committed
  2e2d99b

• fixed all passenger controller tests

  llinneaa

  committed
  3cb730e

• fixed all passenger controller tests

  llinneaa

  committed
  2ceec2b

• Fixed all trip controller tests but create

  llinneaa

  committed
  668c6ae

• Added tests to Trips test for model

  llinneaa

  committed
  806a398

• All trip controller tests passing

  llinneaa

  committed
  b3883ca

• test passed

  sarashahbaig

  committed
  a59faaf

• updated passenger tests

  llinneaa

  committed
  2fe6eb9

• merged files

  llinneaa

  committed
  a829bac

• small edits to test

  llinneaa

  committed
  a95d84a

• test edited

  sarashahbaig

  committed
  a11ba39

• Merge branch 'passengers-branch' of https://github.com/llinneaa/ride-share-rails into driver

  sarashahbaig

  committed
  02e261b

• tests edited

  llinneaa

  committed
  a064a0c

• added a passenger test

  llinneaa

  committed
  c697c99

• all tests passing

  llinneaa

  committed
  f84a028

• added errors to all new pages

  llinneaa

  committed
  c8c93bf

• test code edited

  sarashahbaig

  committed
  048d167

• merged

  sarashahbaig

  committed
  0724d53

• merged c

  sarashahbaig

  committed
  a2757d7

• changes made

  llinneaa

  committed
  2c2c86d

• test edited

  sarashahbaig

  committed
  905f71c

• merged

  llinneaa

  committed
  6bb56eb

Commits on Oct 12, 2019

• added passenger model test

  llinneaa

  committed
  d861821

• test edited

  sarashahbaig

  committed
  10fa737

• Merge branch 'passengers-branch' of https://github.com/llinneaa/ride-share-rails into driver

  sarashahbaig

  committed
  7906049

• test edited

  sarashahbaig

  committed
  f9ff357

• added total earnings test to driver model tests

  llinneaa

  committed
  4c94bca

• all tests are passing

  sarashahbaig

  committed
  5233e84

• minor error with trip test fixed

  llinneaa

  committed
  9d094a5