Code

Updated PR from master#32

Code

Open

steffnay wants to merge 51 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom LetiTran:masterLetiTran/rideshare-rails:masterCopy head branch name to clipboard

+2,418

Commits

Commits on Apr 3, 2018

• updated controllers, models, and routes

  steffnay

  committed
  918a995

  Copy full SHA for 918a995

• updated routes

  steffnay

  committed
  34e2d97

  Copy full SHA for 34e2d97

• updated routes with show

  steffnay

  committed
  2ce76b3

  Copy full SHA for 2ce76b3

• added user_interfaces controller and views

  steffnay

  committed
  d9cbdef

  Copy full SHA for d9cbdef

• added user_interfaces to routes

  steffnay

  committed
  6287ff4

  Copy full SHA for 6287ff4

• Started changing the home page.

  LetiTran

  committed
  2635d13

  Copy full SHA for 2635d13

• Merge branch 'master' of https://github.com/LetiTran/rideshare-rails

  LetiTran

  committed
  7365ede

  Copy full SHA for 7365ede

• Added drivers list to /drivers and options for edit and delete each of them.

  LetiTran

  committed
  1b291ac

  Copy full SHA for 1b291ac

• Added the view for passangers and the options of editing them or deleting.

  LetiTran

  committed
  a816739

  Copy full SHA for a816739

• Added view for trips list.

  LetiTran

  committed
  65c81ee

  Copy full SHA for 65c81ee

• Added a car attribute to Drivers.

  LetiTran

  committed
  c1e94a8

  Copy full SHA for c1e94a8

• Added relations in models. Wrote code for drivers_controlle#show and views/drivers/show

  LetiTran

  committed
  76520d4

  Copy full SHA for 76520d4

• Changed model/passanger to specify relation to trips.

  LetiTran

  committed
  f6ff8d2

  Copy full SHA for f6ff8d2

Commits on Apr 4, 2018

• added passenger show view

  steffnay

  committed
  28066e2

  Copy full SHA for 28066e2

• added _form partial view

  steffnay

  committed
  bfda735

  Copy full SHA for bfda735

• created _driver_status partial view, updated driver#show to include _driver_status partial, updated driver#edit

  steffnay

  committed
  166409c

  Copy full SHA for 166409c

Commits on Apr 5, 2018

• edited trip#index and passenger#show so that driver_id is only displayed as a link if the driver has not been deleted

  steffnay

  committed
  cf2a501

  Copy full SHA for cf2a501

• added show, edit, and delete methods for the trip controller

  steffnay

  committed
  af26854

  Copy full SHA for af26854

• updated create routes so the URI matches the form's submit route

  steffnay

  committed
  7887e36

  Copy full SHA for 7887e36

• implemented add driver function

  steffnay

  committed
  df705b8

  Copy full SHA for df705b8

• added validations to Driver model

  steffnay

  committed
  9808698

  Copy full SHA for 9808698

• created application.css, added styles for hover menu, and updated application view

  steffnay

  committed
  e4b740a

  Copy full SHA for e4b740a

• added #new and #create to passenger controller and set up new passenger view

  steffnay

  committed
  7c75de4

  Copy full SHA for 7c75de4

• added nested route to routes and updated passenger#show with request ride link

  steffnay

  committed
  5cc20b7

  Copy full SHA for 5cc20b7

• added function for rating trips to passenger show view

  steffnay

  committed
  1ab78cb

  Copy full SHA for 1ab78cb

• added passenger#edit to model and updated passenger edit view

  steffnay

  committed
  d756cb8

  Copy full SHA for d756cb8

• added trip#new and trip#create methods and updated request a trip on passenger show view

  steffnay

  committed
  d5a2550

  Copy full SHA for d5a2550

Commits on Apr 6, 2018

• fixed bugs for when drivers or passengers have been deleted

  steffnay

  committed
  ebb3eef

  Copy full SHA for ebb3eef

• ran migrations to add img attribute to driver and passenger

  steffnay

  committed
  fc71765

  Copy full SHA for fc71765

• DRYed controllers.

  LetiTran

  committed
  251059d

  Copy full SHA for 251059d

• Added validation for new passanger.

  LetiTran

  committed
  d90f783

  Copy full SHA for d90f783

• updating driver#index

  steffnay

  committed
  100739b

  Copy full SHA for 100739b

• Merge branch 'master' of https://github.com/LetiTran/rideshare-rails

  Show description for 791b81e
  steffnay

  committed
  791b81e

  Copy full SHA for 791b81e

• trying to debug driver#index

  steffnay

  committed
  c203674

  Copy full SHA for c203674

• updated _passenger_form

  steffnay

  committed
  aa263f1

  Copy full SHA for aa263f1

• DRYed css file a little bit.

  LetiTran

  committed
  ec521ac

  Copy full SHA for ec521ac

• Merging.

  LetiTran

  committed
  8f303cb

  Copy full SHA for 8f303cb

• updated _passenger_form

  steffnay

  committed
  7065d60

  Copy full SHA for 7065d60

• Adding a table to display trips information in Driver.

  LetiTran

  committed
  c636d77

  Copy full SHA for c636d77

• Merge branch 'master' of https://github.com/LetiTran/rideshare-rails

  LetiTran

  committed
  3ee9c22

  Copy full SHA for 3ee9c22

• adde fonts and changed color scheme

  steffnay

  committed
  2295ee9

  Copy full SHA for 2295ee9

• Style show files for passenger, driver and trips.

  LetiTran

  committed
  a4e9612

  Copy full SHA for a4e9612

• Merging after adding style to show files for passenger, driver and trips.

  LetiTran

  committed
  c879a3d

  Copy full SHA for c879a3d

• updated stylesheet with fonts and alignment in h1 and form

  steffnay

  committed
  8d56500

  Copy full SHA for 8d56500

• Added style for 'manage drivers' and 'manage passangers'.

  LetiTran

  committed
  af61d56

  Copy full SHA for af61d56

• deleted unused views

  steffnay

  committed
  1f0f7e7

  Copy full SHA for 1f0f7e7

• Merge

  LetiTran

  committed
  baca259

  Copy full SHA for baca259

• Refactored assets files.

  LetiTran

  committed
  faed191

  Copy full SHA for faed191

• Merge branch 'master' of https://github.com/LetiTran/rideshare-rails

  LetiTran

  committed
  b7f27a2

  Copy full SHA for b7f27a2

• Added drop-down for rating a un-rated trip to be inside of table of trips.

  LetiTran

  committed
  e81cb11

  Copy full SHA for e81cb11

• Adding heroku

  LetiTran

  committed
  664e957

  Copy full SHA for 664e957