Code

Brittany and Phoebe && Ampers#22

Code

Open

brittanyrjones wants to merge 70 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom brittanyrjones:masterbrittanyrjones/rideshare-rails:masterCopy head branch name to clipboard

+2,409

Commits

Commits on Apr 2, 2018

• initial set up

  brittanyrjones

  committed
  9d38880

  Copy full SHA for 9d38880

Commits on Apr 3, 2018

• Created db tables for trip, driver, passenger

  brittanyrjones

  committed
  aeefa11

  Copy full SHA for aeefa11

• added the controller methods for trip, driver, and passenger. Added the db associations for trip, driver, and passenger. Seeded Database.

  brittanyrjones

  committed
  21052de

  Copy full SHA for 21052de

• added restful routes, needs dry

  brittanyrjones

  committed
  2f2d3fe

  Copy full SHA for 2f2d3fe

• Dried up the routes

  brittanyrjones

  committed
  69f532c

  Copy full SHA for 69f532c

• updated driver controller methods

  brittanyrjones

  committed
  c0fd150

  Copy full SHA for c0fd150

• adds index views for all three models

  pmanni02

  committed
  12a2d1f

  Copy full SHA for 12a2d1f

• initial site header

  pmanni02

  committed
  b043ee1

  Copy full SHA for b043ee1

• update controller for trips and passengers

  brittanyrjones

  committed
  cb85b59

  Copy full SHA for cb85b59

• show view for driver

  pmanni02

  committed
  3e4cec0

  Copy full SHA for 3e4cec0

• show view for driver

  pmanni02

  committed
  4e1dda2

  Copy full SHA for 4e1dda2

• updated show method and html pages for the driver

  pmanni02

  committed
  1288567

  Copy full SHA for 1288567

Commits on Apr 4, 2018

• updates show and index pages for the driver, passenger, and trips

  pmanni02

  committed
  6fceafc

  Copy full SHA for 6fceafc

• added edit and delete functions for driver and passenger. Added partial view forms to create a new driver, or a new passenger. Added links to nav to create new driver and passenger

  brittanyrjones

  committed
  553589d

  Copy full SHA for 553589d

• fixed vin number issue, migrated a change to the driver table so vin is string instead of integer

  brittanyrjones

  committed
  aa96cce

  Copy full SHA for aa96cce

• updated views for Trips, added tables to show page for driver, passenger, and trip

  brittanyrjones

  committed
  1f6fd52

  Copy full SHA for 1f6fd52

• fixes merge conflicts

  pmanni02

  committed
  71935a5

  Copy full SHA for 71935a5

• adds/styles nav bar

  pmanni02

  committed
  ef0beb8

  Copy full SHA for ef0beb8

• adds homepage background pic

  pmanni02

  committed
  411ad12

  Copy full SHA for 411ad12

• adds footer

  pmanni02

  committed
  b9fcfa0

  Copy full SHA for b9fcfa0

• added edit and create trip methods and views

  brittanyrjones

  committed
  2ad8a71

  Copy full SHA for 2ad8a71

Commits on Apr 5, 2018

• adds validations for new passenger and driver

  pmanni02

  committed
  3385c40

  Copy full SHA for 3385c40

• fixes lists display issue

  pmanni02

  committed
  ca9e2ff

  Copy full SHA for ca9e2ff

• updates gemfile for new error handling

  pmanni02

  committed
  928981b

  Copy full SHA for 928981b

• adds validation for rating

  pmanni02

  committed
  d2cfee4

  Copy full SHA for d2cfee4

• fixes validatation syntax error

  pmanni02

  committed
  5a83f92

  Copy full SHA for 5a83f92

• added avg rating to driver index pages

  pmanni02

  committed
  8d76cf5

  Copy full SHA for 8d76cf5

• formats driver index page

  pmanni02

  committed
  6877ef7

  Copy full SHA for 6877ef7

• formats passenger index page

  pmanni02

  committed
  fabc646

  Copy full SHA for fabc646

• formats trips index page

  pmanni02

  committed
  5d974e1

  Copy full SHA for 5d974e1

• adds rails pry to gemfile

  pmanni02

  committed
  75940a9

  Copy full SHA for 75940a9

• add trip correctly links to passenger. needs modification on route

  brittanyrjones

  committed
  b0e4f03

  Copy full SHA for b0e4f03

• fixed merge

  brittanyrjones

  committed
  43051cc

  Copy full SHA for 43051cc

• fixed merge conflict in trip.rb

  brittanyrjones

  committed
  8349fb8

  Copy full SHA for 8349fb8

• fixed merge conflict in routes

  brittanyrjones

  committed
  84f4953

  Copy full SHA for 84f4953

• fixed errors in show pages

  brittanyrjones

  committed
  7f4b9db

  Copy full SHA for 7f4b9db

• fixes zero division error in driver show page

  pmanni02

  committed
  2585b73

  Copy full SHA for 2585b73

• adds edit/delete links to index pages

  pmanni02

  committed
  b6d8f63

  Copy full SHA for b6d8f63

• moves homepage image to image folder. fixes heroku image display issue

  pmanni02

  committed
  744ae66

  Copy full SHA for 744ae66

• reverts to image url ref

  pmanni02

  committed
  f42666b

  Copy full SHA for f42666b

• modifies footer

  pmanni02

  committed
  20866f5

  Copy full SHA for 20866f5

• moves index page titles

  pmanni02

  committed
  d4c3272

  Copy full SHA for d4c3272

• changes date formatting

  pmanni02

  committed
  53e47ad

  Copy full SHA for 53e47ad

• reformats driver show page table

  pmanni02

  committed
  ac3ad7e

  Copy full SHA for ac3ad7e

• reformats passenger show page table

  pmanni02

  committed
  ffea18b

  Copy full SHA for ffea18b

• reformates trip show page table and deletes route page comments

  pmanni02

  committed
  4573af0

  Copy full SHA for 4573af0

• reformats pass and driver info

  pmanni02

  committed
  1a502c1

  Copy full SHA for 1a502c1

• reformats trip links

  pmanni02

  committed
  caa1612

  Copy full SHA for caa1612

• adds live links to show pages

  pmanni02

  committed
  a44bcf3

  Copy full SHA for a44bcf3

• updated update trip form

  brittanyrjones

  committed
  cbe84f3

  Copy full SHA for cbe84f3

• code cleanup & driver new form fix

  pmanni02

  committed
  d018c9b

  Copy full SHA for d018c9b

• added column available to driver table

  brittanyrjones

  committed
  ed8e4ff

  Copy full SHA for ed8e4ff

• reformats new and edit forms for passenger and driver

  pmanni02

  committed
  537c5cc

  Copy full SHA for 537c5cc

• reformats trip form

  pmanni02

  committed
  ed097bb

  Copy full SHA for ed097bb

• adds live links to trips index

  pmanni02

  committed
  667f5fa

  Copy full SHA for 667f5fa

• adds color to nav

  pmanni02

  committed
  307e594

  Copy full SHA for 307e594

• formats request_trip link in passenger show page

  pmanni02

  committed
  c756bd4

  Copy full SHA for c756bd4

• styling merge and merge conflict

  pmanni02

  committed
  01fb3fa

  Copy full SHA for 01fb3fa

• reformats edit trip page

  pmanni02

  committed
  9e47ad1

  Copy full SHA for 9e47ad1

Commits on Apr 6, 2018

• added driver status to db

  brittanyrjones

  committed
  de4e3c3

  Copy full SHA for de4e3c3

• fixed merge conflicts

  brittanyrjones

  committed
  a5057ce

  Copy full SHA for a5057ce

• changed view to show driver can be avail.

  brittanyrjones

  committed
  663c138

  Copy full SHA for 663c138

• title text margin fixes

  pmanni02

  committed
  a27c6c8

  Copy full SHA for a27c6c8

• changes from homepage photo from jpeg to png

  pmanni02

  committed
  88c8d68

  Copy full SHA for 88c8d68

• all add trip functions working, driver selected at random, to fix soon

  brittanyrjones

  committed
  cabb203

  Copy full SHA for cabb203

• fixed merge conflict

  brittanyrjones

  committed
  bd49511

  Copy full SHA for bd49511

• fixes homepage issue

  pmanni02

  committed
  2cb9286

  Copy full SHA for 2cb9286

• fixes edit trip form

  pmanni02

  committed
  ffc0512

  Copy full SHA for ffc0512

Commits on Apr 7, 2018

• fixes nil rating issue

  pmanni02

  committed
  6e68de8

  Copy full SHA for 6e68de8

• fixed errors in creating trip

  brittanyrjones

  committed
  7a73b98

  Copy full SHA for 7a73b98