Code

Hannah & Emilce - RideShare - Octos#25

Code

Open

emilcecarlisa wants to merge 37 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom emilcecarlisa:masteremilcecarlisa/rideshare-rails:masterCopy head branch name to clipboard

+1,978-176

Commits

Commits on Apr 3, 2018

• Genesis. Created db and models

  emilcecarlisa

  committed
  38d4f67

  Copy full SHA for 38d4f67

• Move everything up a level

  emilcecarlisa

  committed
  65f2775

  Copy full SHA for 65f2775

• made relations between models

  hannahlcameron

  committed
  4223ced

  Copy full SHA for 4223ced

• Added routes

  emilcecarlisa

  committed
  5863432

  Copy full SHA for 5863432

• added in passenger_controller. set up method stubs.

  hannahlcameron

  committed
  9bc7bec

  Copy full SHA for 9bc7bec

Commits on Apr 4, 2018

• Driver controller methods and seeding

  emilcecarlisa

  committed
  43de80e

  Copy full SHA for 43de80e

• added in methods for passenger controller. stubbed out passenger views

  hannahlcameron

  committed
  b9d98b3

  Copy full SHA for b9d98b3

• merge resolved

  emilcecarlisa

  committed
  1f69df1

  Copy full SHA for 1f69df1

• Added Trips Controller

  emilcecarlisa

  committed
  820db1e

  Copy full SHA for 820db1e

Commits on Apr 5, 2018

• modified names of passenger and trip controllers and class names. added file to gitignore

  hannahlcameron

  committed
  08e8f9c

  Copy full SHA for 08e8f9c

• revised gitignore to contain tmp file

  hannahlcameron

  committed
  1e3dbea

  Copy full SHA for 1e3dbea

• remove tmp and log files

  hannahlcameron

  committed
  dbc80fc

  Copy full SHA for dbc80fc

• added html to passengers index and show

  hannahlcameron

  committed
  1603ae8

  Copy full SHA for 1603ae8

• added links to show html; added method to passenger model

  hannahlcameron

  committed
  bd9327d

  Copy full SHA for bd9327d

• added in forms in new and edit; minor tweaks in index, and show

  hannahlcameron

  committed
  ed2a247

  Copy full SHA for ed2a247

• Driver list displaying and total earnings on each driver page rendering

  emilcecarlisa

  committed
  1d2682b

  Copy full SHA for 1d2682b

• Added average rating to driver

  emilcecarlisa

  committed
  a51201a

  Copy full SHA for a51201a

• fixed issues with passenger#total_spent and strong params. Added in error message handling for new passenger

  hannahlcameron

  committed
  3b6a244

  Copy full SHA for 3b6a244

• added nested route for new trip for a passenger; added in link to access that page

  hannahlcameron

  committed
  4d31419

  Copy full SHA for 4d31419

• added tmp directory to gitignore

  hannahlcameron

  committed
  c140118

  Copy full SHA for c140118

• added list of trips to driver view

  emilcecarlisa

  committed
  c48e30a

  Copy full SHA for c48e30a

• adding changes from passenger_feature. tmp files deleted/ignored

  hannahlcameron

  committed
  0fac141

  Copy full SHA for 0fac141

• added validation to driver feature

  emilcecarlisa

  committed
  4ca1bc4

  Copy full SHA for 4ca1bc4

Commits on Apr 6, 2018

• added in trip html files; wrote index and show html. fixed typo in passenger show

  hannahlcameron

  committed
  33241e2

  Copy full SHA for 33241e2

• prepping for merge

  emilcecarlisa

  committed
  1acd537

  Copy full SHA for 1acd537

• Created .gitignore file

  emilcecarlisa

  committed
  eaa206f

  Copy full SHA for eaa206f

• Created .gitignore file

  emilcecarlisa

  committed
  b85f52a

  Copy full SHA for b85f52a

• Merged driver-feature into master

  emilcecarlisa

  committed
  9b876bc

  Copy full SHA for 9b876bc

• Created new driver view

  emilcecarlisa

  committed
  98dc78e

  Copy full SHA for 98dc78e

• added in app/views/trips

  hannahlcameron

  committed
  3b0e180

  Copy full SHA for 3b0e180

• resolving issue with tmp files

  hannahlcameron

  committed
  50f1a48

  Copy full SHA for 50f1a48

• added trips/_form

  hannahlcameron

  committed
  debca0d

  Copy full SHA for debca0d

• resolving merge conflict

  hannahlcameron

  committed
  6c80aea

  Copy full SHA for 6c80aea

• modify nested route to create instead of new; updated links to reflect this change; updated create trip method to take in info; built get_avail_driver method

  hannahlcameron

  committed
  a641b9d

  Copy full SHA for a641b9d

• added new column to driver, added dropdown in driver new view for status, edited total_revenue method to handle trips in progress and wording to reflect this

  hannahlcameron

  committed
  9822241

  Copy full SHA for 9822241

Commits on Apr 7, 2018

• added ability to edit and delete trip; able to set rating

  hannahlcameron

  committed
  999fc1e

  Copy full SHA for 999fc1e

• Added root route.

  emilcecarlisa

  committed
  19cca87

  Copy full SHA for 19cca87