Code

Div-Hannah Rideshare#11

Code

Open

Naltrexone wants to merge 74 commits intoAda-C10:masterAda-C10/ride-share-rails:masterfrom Naltrexone:masterNaltrexone/ride-share-rails:masterCopy head branch name to clipboard

+2,663

Commits

Commits on Oct 1, 2018

• rails.new

  hertweckhr1

  committed
  fef4e25

  Copy full SHA for fef4e25

Commits on Oct 2, 2018

• generate driver controller

  hertweckhr1

  committed
  9879e0a

  Copy full SHA for 9879e0a

• driver model generated with name and vin columns

  hertweckhr1

  committed
  5857148

  Copy full SHA for 5857148

• migrated driver model and created database

  hertweckhr1

  committed
  bbe80fa

  Copy full SHA for bbe80fa

• added core to index and show view incoporating csv file

  hertweckhr1

  committed
  39281b2

  Copy full SHA for 39281b2

• delete and edit added to view, edit and new form completed

  hertweckhr1

  committed
  432a566

  Copy full SHA for 432a566

• Created models and columns

  Naltrexone

  committed
  4b34ea5

  Copy full SHA for 4b34ea5

• Merging branches

  Naltrexone

  committed
  e995aa2

  Copy full SHA for e995aa2

• driver controller methods complete plus migrated passenger columns

  hertweckhr1

  committed
  8e002ed

  Copy full SHA for 8e002ed

• added columns and references to trips plus migrated

  hertweckhr1

  committed
  fa59153

  Copy full SHA for fa59153

• Added routes

  Naltrexone

  committed
  1a8860d

  Copy full SHA for 1a8860d

• Added index to passenger controller

  Naltrexone

  committed
  b659dcb

  Copy full SHA for b659dcb

• average rating and total earnings mthods created and in driver view window

  hertweckhr1

  committed
  980d889

  Copy full SHA for 980d889

• show, edit, delete created for trips plus added individual trip link to trip list

  hertweckhr1

  committed
  fc0bf83

  Copy full SHA for fc0bf83

Commits on Oct 3, 2018

• added validation on vin name and all trip attributes

  hertweckhr1

  committed
  312c14f

  Copy full SHA for 312c14f

• homepage controller created with beginning layout

  hertweckhr1

  committed
  423be95

  Copy full SHA for 423be95

• Some functions for passenger working

  Naltrexone

  committed
  306b3a5

  Copy full SHA for 306b3a5

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  Naltrexone

  committed
  7a7b59f

  Copy full SHA for 7a7b59f

• Changed model for passenger

  Naltrexone

  committed
  c8058a0

  Copy full SHA for c8058a0

• fixed trip validation

  hertweckhr1

  committed
  9cea2a3

  Copy full SHA for 9cea2a3

• fixed layout of homepage so does not affect other pages

  hertweckhr1

  committed
  189015a

  Copy full SHA for 189015a

• added links to driver and passenger from homepage and link to home from drivers page

  hertweckhr1

  committed
  57356f0

  Copy full SHA for 57356f0

• added info section to homepage

  hertweckhr1

  committed
  b604a9f

  Copy full SHA for b604a9f

• added validation and working error messages pop up for driver

  hertweckhr1

  committed
  a0ed076

  Copy full SHA for a0ed076

• routes in progress

  hertweckhr1

  committed
  091f28d

  Copy full SHA for 091f28d

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  2b83faf

  Copy full SHA for 2b83faf

Commits on Oct 4, 2018

• Edit and delete functions for passenger working

  Naltrexone

  committed
  a51425b

  Copy full SHA for a51425b

• worked on routes and trips link accidentally in master

  hertweckhr1

  committed
  6c596b5

  Copy full SHA for 6c596b5

• started fomatting application and driver html.erb

  hertweckhr1

  committed
  3fbfd4e

  Copy full SHA for 3fbfd4e

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  2ad538d

  Copy full SHA for 2ad538d

• adjustments to driver and application html.erb

  hertweckhr1

  committed
  3a5a8cf

  Copy full SHA for 3a5a8cf

• fixed conflicts with application.html.erb

  hertweckhr1

  committed
  6622e67

  Copy full SHA for 6622e67

• changed html and css for welcome and driver add turtle icon and aligned left, home icon noted out for now

  hertweckhr1

  committed
  34bdf91

  Copy full SHA for 34bdf91

• added table to drivers

  hertweckhr1

  committed
  87a1fdd

  Copy full SHA for 87a1fdd

• added home button to welcome screen

  hertweckhr1

  committed
  9277f17

  Copy full SHA for 9277f17

• made sure each part of website had same header

  hertweckhr1

  committed
  a24a4f0

  Copy full SHA for a24a4f0

• fixed merges

  hertweckhr1

  committed
  42c1774

  Copy full SHA for 42c1774

• edited routes to working

  hertweckhr1

  committed
  3667be0

  Copy full SHA for 3667be0

• welcome buttons updated

  hertweckhr1

  committed
  a8ef7c4

  Copy full SHA for a8ef7c4

• changed driver button in driver css

  hertweckhr1

  committed
  a6e653f

  Copy full SHA for a6e653f

• Passenger page Edit, Delete,trip details working

  Naltrexone

  committed
  e8c8ab6

  Copy full SHA for e8c8ab6

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  Show description for 6fab70b
  Naltrexone

  committed
  6fab70b

  Copy full SHA for 6fab70b

• font via application

  hertweckhr1

  committed
  56b380b

  Copy full SHA for 56b380b

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  7cfb6f1

  Copy full SHA for 7cfb6f1

• changes to passenger view

  hertweckhr1

  committed
  1ecf099

  Copy full SHA for 1ecf099

• passenger index view in line with driver index

  hertweckhr1

  committed
  6f9df8a

  Copy full SHA for 6f9df8a

• Form for adding new trip created

  Naltrexone

  committed
  6ad7dc6

  Copy full SHA for 6ad7dc6

• editing passenger show

  hertweckhr1

  committed
  0ec9537

  Copy full SHA for 0ec9537

• merged changed made

  hertweckhr1

  committed
  5b44a68

  Copy full SHA for 5b44a68

• changes merged

  hertweckhr1

  committed
  84fae56

  Copy full SHA for 84fae56

• updated passenger show to match driver format

  hertweckhr1

  committed
  fd53e93

  Copy full SHA for fd53e93

• driver and passenger show now match with small box centered for customer info

  hertweckhr1

  committed
  578181f

  Copy full SHA for 578181f

• added currency symbol

  hertweckhr1

  committed
  65c030c

  Copy full SHA for 65c030c

Commits on Oct 5, 2018

• Fixed errors in passenger controller

  Naltrexone

  committed
  e74d0f1

  Copy full SHA for e74d0f1

• Added driver to new trip

  Naltrexone

  committed
  155aec5

  Copy full SHA for 155aec5

• Add trip for passenger done

  Naltrexone

  committed
  67f6679

  Copy full SHA for 67f6679

• added background photo to top of passenger and driver index pages

  hertweckhr1

  committed
  e7a77d2

  Copy full SHA for e7a77d2

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  83eb09a

  Copy full SHA for 83eb09a

• Made changes to trip form format

  Naltrexone

  committed
  493e22c

  Copy full SHA for 493e22c

• Updated New driver with picture button and underlined text field

  hertweckhr1

  committed
  f4af490

  Copy full SHA for f4af490

• color changed for table hover

  hertweckhr1

  committed
  e5496fc

  Copy full SHA for e5496fc

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  c805438

  Copy full SHA for c805438

• Created dropdown menu for Edit Trip

  Naltrexone

  committed
  20a012e

  Copy full SHA for 20a012e

• Styled Add Trip form

  Naltrexone

  committed
  663b1c7

  Copy full SHA for 663b1c7

• added paginate gem

  hertweckhr1

  committed
  6af3394

  Copy full SHA for 6af3394

• added pagination to driver and passenger index

  hertweckhr1

  committed
  a66d773

  Copy full SHA for a66d773

• Styling for forms in process - working model

  Naltrexone

  committed
  b914d16

  Copy full SHA for b914d16

• removed trip rating validation

  hertweckhr1

  committed
  8fee02a

  Copy full SHA for 8fee02a

• changed update in passenger fcontroller to render edit if incorrect information

  hertweckhr1

  committed
  b6dd023

  Copy full SHA for b6dd023

• removed bullet point from validation error messages

  hertweckhr1

  committed
  36d8d43

  Copy full SHA for 36d8d43

• Styling changes made

  Naltrexone

  committed
  73ae322

  Copy full SHA for 73ae322

• Merge branch 'master' of https://github.com/Naltrexone/ride-share-rails

  hertweckhr1

  committed
  f23f7c2

  Copy full SHA for f23f7c2

• fixed html formatting for correctly lining up

  hertweckhr1

  committed
  c5047a0

  Copy full SHA for c5047a0

• changed image url in welcome css

  Naltrexone

  committed
  2f53f09

  Copy full SHA for 2f53f09