Code

Sockets - Kate and Shirley #13

Code

Open

shirley1chu wants to merge 28 commits intoAda-C11:masterAda-C11/ride-share-rails:masterfrom shirley1chu:mastershirley1chu/ride-share-rails:masterCopy head branch name to clipboard

+2,722-200

Commits

Commits on Apr 15, 2019

• created new rails project

  shirley1chu

  committed
  8548fdb

  Copy full SHA for 8548fdb

• created controllers and models, seeded database

  shirley1chu

  committed
  9a51b66

  Copy full SHA for 9a51b66

• passed some passenger model tests, added routes, added homepages controller

  shirley1chu

  committed
  7c8f827

  Copy full SHA for 7c8f827

Commits on Apr 16, 2019

• created and wrote tests for passengers routes and details

  shirley1chu

  committed
  ffa1989

  Copy full SHA for ffa1989

Commits on Apr 17, 2019

• wrote index and show methods/tests for trip

  shirley1chu

  committed
  bf9a66e

  Copy full SHA for bf9a66e

• working on create method

  shirley1chu

  committed
  10d0c21

  Copy full SHA for 10d0c21

• fixed typo in passengercontroller

  shirley1chu

  committed
  ea4dc51

  Copy full SHA for ea4dc51

• passed create trip tests

  shirley1chu

  committed
  7b40ac8

  Copy full SHA for 7b40ac8

• finished all RESTful routes for TripController, need to fix rating validation and update bad request test

  shirley1chu

  committed
  b090c44

  Copy full SHA for b090c44

• Merge branch 'tripcontroller'

  shirley1chu

  committed
  3bfd5b5

  Copy full SHA for 3bfd5b5

• small trip controller test tweak

  shirley1chu

  committed
  de60169

  Copy full SHA for de60169

Commits on Apr 18, 2019

• fixed view fields for passenger and trips

  shirley1chu

  committed
  c280be9

  Copy full SHA for c280be9

• drivers

  KateAnnNichols

  committed
  9d85f5d

  Copy full SHA for 9d85f5d

• Merge pull request #1 from shirley1chu/driver

  Show description for 6e25fdb
  KateAnnNichols

  authored
  6e25fdb

  Copy full SHA for 6e25fdb

• added sum and avg_rating driver model methods

  shirley1chu

  committed
  33fec67

  Copy full SHA for 33fec67

• added navbar

  shirley1chu

  committed
  e449515

  Copy full SHA for e449515

• added homepage

  shirley1chu

  committed
  e590c23

  Copy full SHA for e590c23

• driver changes + some styling

  KateAnnNichols

  committed
  9f8eb55

  Copy full SHA for 9f8eb55

Commits on Apr 19, 2019

• removed css to fix deploy error

  KateAnnNichols

  committed
  9de1136

  Copy full SHA for 9de1136

• css change

  KateAnnNichols

  committed
  c7a6005

  Copy full SHA for c7a6005

• fixed drivers_controller.rb

  KateAnnNichols

  committed
  7b9010f

  Copy full SHA for 7b9010f

• revert back

  KateAnnNichols

  committed
  4e8d37f

  Copy full SHA for 4e8d37f

• added all trips link

  shirley1chu

  committed
  2423f47

  Copy full SHA for 2423f47

• got rid of nav in application.css

  shirley1chu

  committed
  f85fe8f

  Copy full SHA for f85fe8f

• got rid of require pry

  shirley1chu

  committed
  8519365

  Copy full SHA for 8519365

• readded styling

  shirley1chu

  committed
  5fe2474

  Copy full SHA for 5fe2474

• changed h2 headings to h1

  shirley1chu

  committed
  8be220d

  Copy full SHA for 8be220d

• trip rating validation, added css styling

  shirley1chu

  committed
  137723b

  Copy full SHA for 137723b