Code

Brenda and Brandy - Rideshare - Octos#17

Code

Open

brandyaustinseattle wants to merge 75 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom brandyaustinseattle:masterbrandyaustinseattle/rideshare-rails:masterCopy head branch name to clipboard

+2,170

Commits

Commits on Apr 3, 2018

• Created rails project

  brandyaustinseattle

  committed
  5b01575

  Copy full SHA for 5b01575

• Added controllers and models, created db

  brandyaustinseattle

  committed
  e158ac5

  Copy full SHA for e158ac5

• Database set up with add reference migration

  brandyaustinseattle

  committed
  34b74c8

  Copy full SHA for 34b74c8

• Added html.erb files

  brandyaustinseattle

  committed
  8a3ccac

  Copy full SHA for 8a3ccac

• Added resources routes

  brendarios

  committed
  f97b4f1

  Copy full SHA for f97b4f1

• Created a main controller for the homepage.

  brendarios

  committed
  89a301e

  Copy full SHA for 89a301e

• Added functions to passengers_controller

  brandyaustinseattle

  committed
  970ff2d

  Copy full SHA for 970ff2d

• Created drivers controller methods.

  brendarios

  committed
  fce2a7a

  Copy full SHA for fce2a7a

• Refactor some methods in drivers controller.

  brendarios

  committed
  77bf932

  Copy full SHA for 77bf932

• Added index view for passenger

  brandyaustinseattle

  committed
  9c68c0e

  Copy full SHA for 9c68c0e

• Worked on passengers view and added pagination

  brandyaustinseattle

  committed
  36345ce

  Copy full SHA for 36345ce

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

  Show description for eb918df
  brendarios

  committed
  eb918df

  Copy full SHA for eb918df

• Changes in driver controller and index.html.erb

  brendarios

  committed
  167c5fe

  Copy full SHA for 167c5fe

• Updated styling for index views

  brandyaustinseattle

  committed
  4771474

  Copy full SHA for 4771474

• Created drivers view index.

  brendarios

  committed
  33f679f

  Copy full SHA for 33f679f

• Paginate working for passengers

  brandyaustinseattle

  committed
  b4f6521

  Copy full SHA for b4f6521

• Added paginate to drivers index and created files show, new, and edit html for drivers.

  brendarios

  committed
  5ce9be3

  Copy full SHA for 5ce9be3

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

  Show description for 8fa1794
  brendarios

  committed
  8fa1794

  Copy full SHA for 8fa1794

• Working on show views

  brandyaustinseattle

  committed
  d5a9dd2

  Copy full SHA for d5a9dd2

• Adding trips to passenger show

  brandyaustinseattle

  committed
  840863b

  Copy full SHA for 840863b

• Added to Drivers details the trips table and total earnings.

  brendarios

  committed
  2c1d7ac

  Copy full SHA for 2c1d7ac

Commits on Apr 4, 2018

• Add average rating method in Drivers model and show it in the Drivers details.

  brendarios

  committed
  5898aa3

  Copy full SHA for 5898aa3

• Styling for passengers and trips pages

  brandyaustinseattle

  committed
  f0ba7c0

  Copy full SHA for f0ba7c0

• refactor html in Drivers show file

  brendarios

  committed
  4324bce

  Copy full SHA for 4324bce

• Final styling for passengers and drivers details

  brandyaustinseattle

  committed
  9ffdf98

  Copy full SHA for 9ffdf98

• Set up trips controller

  brandyaustinseattle

  committed
  31f8241

  Copy full SHA for 31f8241

• Refactor delete link on drivers trips table.

  brendarios

  committed
  a05b8d0

  Copy full SHA for a05b8d0

• Added trip details page

  brandyaustinseattle

  committed
  3bbc701

  Copy full SHA for 3bbc701

• Add partial view file for new and edit for Drivers.

  brendarios

  committed
  2d6d3a4

  Copy full SHA for 2d6d3a4

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

  Show description for 14a852f
  brendarios

  committed
  14a852f

  Copy full SHA for 14a852f

Commits on Apr 5, 2018

• In process of doing create trip

  brandyaustinseattle

  committed
  5a089b3

  Copy full SHA for 5a089b3

• Refactor drivers controller to use strong params.

  brendarios

  committed
  c0b8955

  Copy full SHA for c0b8955

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

  Show description for 7a0cec1
  brendarios

  committed
  7a0cec1

  Copy full SHA for 7a0cec1

• In process of creating trips

  brendarios

  committed
  52eb879

  Copy full SHA for 52eb879

• process of creating new trips

  brendarios

  committed
  7c8fc81

  Copy full SHA for 7c8fc81

• Created new driver, edit driver, and created error messages file.

  brendarios

  committed
  f37cf6c

  Copy full SHA for f37cf6c

• Major changes to trips controller

  brandyaustinseattle

  committed
  2ae6574

  Copy full SHA for 2ae6574

• Major changes to trips controller

  brandyaustinseattle

  committed
  05ae4b6

  Copy full SHA for 05ae4b6

• Fixed edit and delete buttons on index pages

  brandyaustinseattle

  committed
  3085275

  Copy full SHA for 3085275

• fixed bugs in drivers.

  brendarios

  committed
  ad0ba8c

  Copy full SHA for ad0ba8c

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

  Show description for c005c9f
  brendarios

  committed
  c005c9f

  Copy full SHA for c005c9f

• Fixed delete driver bug to delete and stay in the same page.

  brendarios

  committed
  c328c07

  Copy full SHA for c328c07

• Fixed routes issue

  brandyaustinseattle

  committed
  2ec0efe

  Copy full SHA for 2ec0efe

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

  Show description for 7c4423b
  brandyaustinseattle

  committed
  7c4423b

  Copy full SHA for 7c4423b

• Fixed bug in drivers to show the details of the trips of a driver.

  brendarios

  committed
  2e87b49

  Copy full SHA for 2e87b49

• Added link to trips details page

  brandyaustinseattle

  committed
  be20844

  Copy full SHA for be20844

• Working on trip edit button

  brandyaustinseattle

  committed
  543221f

  Copy full SHA for 543221f

• added a conditional for rating in the model.

  brendarios

  committed
  3c9c4f0

  Copy full SHA for 3c9c4f0

• Added links of drivers and passengers on the Trips details.

  brendarios

  committed
  70cc7e1

  Copy full SHA for 70cc7e1

• Added details to trips edit form

  brandyaustinseattle

  committed
  0cc227b

  Copy full SHA for 0cc227b

• Add link for error messages.

  brendarios

  committed
  bf5c954

  Copy full SHA for bf5c954

• Add a link to add a new passenger.

  brendarios

  committed
  4338705

  Copy full SHA for 4338705

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

  Show description for 8184f95
  brendarios

  committed
  8184f95

  Copy full SHA for 8184f95

• Finished form for trip

  brandyaustinseattle

  committed
  97c2715

  Copy full SHA for 97c2715

Commits on Apr 6, 2018

• Working on styling

  brandyaustinseattle

  committed
  d6b9d30

  Copy full SHA for d6b9d30

• Header styling

  brandyaustinseattle

  committed
  687bb86

  Copy full SHA for 687bb86

• Added links to the root page

  brendarios

  committed
  4a986ca

  Copy full SHA for 4a986ca

• Styling root page.

  brendarios

  committed
  44e145b

  Copy full SHA for 44e145b

• Added font

  brandyaustinseattle

  committed
  b6b2eda

  Copy full SHA for b6b2eda

• Styling for header and driver/passenger rectangles

  brandyaustinseattle

  committed
  721f247

  Copy full SHA for 721f247

• Fixed the path of the create passenger button.

  brendarios

  committed
  0e23bc7

  Copy full SHA for 0e23bc7

• Added Home button in the navigation bar.

  brendarios

  committed
  1753b7b

  Copy full SHA for 1753b7b

• Random styling

  brandyaustinseattle

  committed
  899fb6d

  Copy full SHA for 899fb6d

• Styling Home button

  brandyaustinseattle

  committed
  d96be23

  Copy full SHA for d96be23

• added images.

  brendarios

  committed
  5dc49d4

  Copy full SHA for 5dc49d4

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

  Show description for ab07d90
  brendarios

  committed
  ab07d90

  Copy full SHA for ab07d90

• Changed cost to dollars

  brandyaustinseattle

  committed
  4fe221f

  Copy full SHA for 4fe221f

• Deploying draft

  brandyaustinseattle

  committed
  9e19a99

  Copy full SHA for 9e19a99

• Added styling to the form fields.

  brendarios

  committed
  c0232c5

  Copy full SHA for c0232c5

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

  Show description for 562c9b7
  brendarios

  committed
  562c9b7

  Copy full SHA for 562c9b7

• Styling to tables and homepage

  brandyaustinseattle

  committed
  ce9c891

  Copy full SHA for ce9c891

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

  Show description for c042add
  brandyaustinseattle

  committed
  c042add

  Copy full SHA for c042add

• eliminated a div.

  brendarios

  committed
  50535dc

  Copy full SHA for 50535dc

• Buttons on homepage

  brandyaustinseattle

  committed
  f15aec1

  Copy full SHA for f15aec1

Commits on Apr 7, 2018

• text decoration line in request trip button.

  brendarios

  committed
  274c32d

  Copy full SHA for 274c32d