Code

Carets -- Laura & Victoria#20

Code

Open

vsawchuk wants to merge 41 commits intoAda-C8:masterAda-C8/rideshare-rails:masterfrom vsawchuk:mastervsawchuk/rideshare-rails:masterCopy head branch name to clipboard

+3,097-698

Commits

Commits on Oct 2, 2017

• Initialize rails app

  vsawchuk

  committed
  c40faab

  Copy full SHA for c40faab

• Add Driver, Passenger, and Trip models, migrate db

  vsawchuk

  committed
  4cbad56

  Copy full SHA for 4cbad56

• Database seeded

  vsawchuk

  committed
  b23614d

  Copy full SHA for b23614d

• Add Passenger and Rideshare controllers

  vsawchuk

  committed
  0a164b3

  Copy full SHA for 0a164b3

• Display passenger names on route /passengers

  vsawchuk

  committed
  fe85e79

  Copy full SHA for fe85e79

• Display list of drivers on route /driver/index

  Show description for cef4b61
  vsawchuk

  committed
  cef4b61

  Copy full SHA for cef4b61

• Link to driver detail page from list of drivers

  vsawchuk

  committed
  531e1a2

  Copy full SHA for 531e1a2

• Passenger controller, html.erb pages

  LauraAddams

  committed
  aad766c

  Copy full SHA for aad766c

• Added references between trips, driver, passenger

  LauraAddams

  committed
  30b2b5d

  Copy full SHA for 30b2b5d

• Display list of trips taken by passenger on details page

  LauraAddams

  committed
  719d20b

  Copy full SHA for 719d20b

Commits on Oct 3, 2017

• Added edit and delete for Passenger

  LauraAddams

  committed
  a738bd1

  Copy full SHA for a738bd1

• Add trip details page, link to passenger details page'

  vsawchuk

  committed
  5f8734f

  Copy full SHA for 5f8734f

• Add link to trip details page to passenger details page

  vsawchuk

  committed
  dd313cb

  Copy full SHA for dd313cb

• Driver details page added

  LauraAddams

  committed
  7adc7d0

  Copy full SHA for 7adc7d0

• Add links to details pages from other details pages

  vsawchuk

  committed
  4ddba33

  Copy full SHA for 4ddba33

• Modify controllers to plural versions of their names

  vsawchuk

  committed
  36c1b74

  Copy full SHA for 36c1b74

• Add ability to create new trip with no rating

  vsawchuk

  committed
  18a3e53

  Copy full SHA for 18a3e53

• Application html setup, light CSS styling, driver edit view added

  LauraAddams

  committed
  49c3e77

  Copy full SHA for 49c3e77

Commits on Oct 5, 2017

• Passenger can add a rating to a trip without one

  LauraAddams

  committed
  6f5ab99

  Copy full SHA for 6f5ab99

• Add edit_trip path

  vsawchuk

  committed
  5e97d93

  Copy full SHA for 5e97d93

• Resolve merge conflict for edit_trip path in routes

  vsawchuk

  committed
  099e396

  Copy full SHA for 099e396

• Add functionality to edit a trip rating from the show trip view

  vsawchuk

  committed
  2a24db7

  Copy full SHA for 2a24db7

• Added styling to nav and tables for mobile responsivness

  LauraAddams

  committed
  b5e9f68

  Copy full SHA for b5e9f68

• Shift all tables to adapt to screen size <600px

  vsawchuk

  committed
  05b4cdc

  Copy full SHA for 05b4cdc

• Add tandem bike photo to assets

  vsawchuk

  committed
  2a001bb

  Copy full SHA for 2a001bb

• Begin styling nav, header, footer

  LauraAddams

  committed
  989aa46

  Copy full SHA for 989aa46

Commits on Oct 6, 2017

• Model validations on Passenger and Driver, print errors for adding new passenger or driver

  vsawchuk

  committed
  c0df60a

  Copy full SHA for c0df60a

• Update passengers controller to redirect to passengers_path instead of passenger_index_path

  vsawchuk

  committed
  8d40323

  Copy full SHA for 8d40323

• Styling to Passenger and Driver index pages

  LauraAddams

  committed
  f45f609

  Copy full SHA for f45f609

• Footer always at bottom

  LauraAddams

  committed
  1554f14

  Copy full SHA for 1554f14

• add radio buttons to trip rating

  vsawchuk

  committed
  2f5d7c5

  Copy full SHA for 2f5d7c5

• Add star ratings to passenger page for trip rating

  vsawchuk

  committed
  ba74dd4

  Copy full SHA for ba74dd4

• Change html image tag to rails image_tag

  vsawchuk

  committed
  d07a878

  Copy full SHA for d07a878

• remove duplicate tandemshare heading on homepage

  vsawchuk

  committed
  cc0ee07

  Copy full SHA for cc0ee07

• Give drivers a status of online or offline

  vsawchuk

  committed
  bc062a6

  Copy full SHA for bc062a6

• Passengers can only get a driver that is online

  vsawchuk

  committed
  92388d9

  Copy full SHA for 92388d9

• Styling to forms, and passenger page

  LauraAddams

  committed
  5fbed13

  Copy full SHA for 5fbed13

• Add status to trips

  vsawchuk

  committed
  57c47a0

  Copy full SHA for 57c47a0

• Update seed files and seed script to include status for drivers and trips

  vsawchuk

  committed
  7b14e1a

  Copy full SHA for 7b14e1a

• Final styling to driver, passenger pages, and index

  LauraAddams

  committed
  c0d3915

  Copy full SHA for c0d3915

• Merge branch 'master' of https://github.com/vsawchuk/rideshare-rails to combine styling and db changes

  vsawchuk

  committed
  c9a898e

  Copy full SHA for c9a898e