Code

&&: Maddie & Kate#28

Code

Open

Oh-KPond wants to merge 57 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom Oh-KPond:masterOh-KPond/rideshare-rails:masterCopy head branch name to clipboard

+2,265

Commits

Commits on Apr 3, 2018

• creates rails app

  Oh-KPond

  committed
  09054af

  Copy full SHA for 09054af

• Create Trip, Driver, & Passenger models

  madaleines

  committed
  6cd6a3f

  Copy full SHA for 6cd6a3f

• add route for view all drivers and a controller for drivers

  Oh-KPond

  committed
  0c3e3cc

  Copy full SHA for 0c3e3cc

• adds a drivers view

  Oh-KPond

  committed
  6874949

  Copy full SHA for 6874949

• adds ruby html to view all drivers

  Oh-KPond

  committed
  60ac157

  Copy full SHA for 60ac157

• updates routes to use resources for drivers

  Oh-KPond

  committed
  a115eb2

  Copy full SHA for a115eb2

• Merge pull request #1 from Oh-KPond/feature_all-drivers-controller

  Show description for dab2654
  madaleines

  authored
  dab2654

  Copy full SHA for dab2654

• Rename phone_num column

  madaleines

  committed
  18f4801

  Copy full SHA for 18f4801

• Creates a view for all Passengers

  madaleines

  committed
  ccb4468

  Copy full SHA for ccb4468

• Adds trips controller & view

  madaleines

  committed
  1e0c4c8

  Copy full SHA for 1e0c4c8

• adds foreign keys to trips

  Oh-KPond

  committed
  4524702

  Copy full SHA for 4524702

• View Individual Passenger Pages

  madaleines

  committed
  6ef71ea

  Copy full SHA for 6ef71ea

• Destroy passenger and makes Foreign key Passenger_id nil

  madaleines

  committed
  a7d9ffa

  Copy full SHA for a7d9ffa

• Clean up Passenger Controller

  madaleines

  committed
  5969967

  Copy full SHA for 5969967

• modifies driver controller for CRUD

  Oh-KPond

  committed
  8ac1348

  Copy full SHA for 8ac1348

• Show list of linked Trips under Individual Passenger

  madaleines

  committed
  253d7c5

  Copy full SHA for 253d7c5

• Calculates total_charge for Passenger's Trips

  madaleines

  committed
  029fd41

  Copy full SHA for 029fd41

Commits on Apr 4, 2018

• Validate User Input for Creating a Passenger

  madaleines

  committed
  5f9966c

  Copy full SHA for 5f9966c

• Merge pull request #2 from Oh-KPond/feature_view-single-passenger

  Show description for 8a13931
  Oh-KPond

  authored
  8a13931

  Copy full SHA for 8a13931

• Creates view for Trip

  madaleines

  committed
  b92b808

  Copy full SHA for b92b808

• Link to Passenger page from Trip View

  madaleines

  committed
  29724a4

  Copy full SHA for 29724a4

• Merge branch 'master' of github.com:Oh-KPond/rideshare-rails into feature_view-single-driver

  Oh-KPond

  committed
  9a87405

  Copy full SHA for 9a87405

• Creates view of single driver

  Oh-KPond

  committed
  69b4949

  Copy full SHA for 69b4949

• creates validation for driver forms

  Oh-KPond

  committed
  3a3fc9f

  Copy full SHA for 3a3fc9f

• adds links to the nav for drivers and add a driver

  Oh-KPond

  committed
  c83a5cf

  Copy full SHA for c83a5cf

• adds driver to Trip view

  Oh-KPond

  committed
  fe1ef29

  Copy full SHA for fe1ef29

• Merge pull request #3 from Oh-KPond/feature_view-single-driver

  Show description for 7b8b038
  madaleines

  authored
  7b8b038

  Copy full SHA for 7b8b038

• Trip Partial Form

  madaleines

  committed
  0a6e743

  Copy full SHA for 0a6e743

• Click on individual Trip from View page to siew details of Trip

  madaleines

  committed
  f23386f

  Copy full SHA for f23386f

• Show Deleted Passenger/Driver on Trip Info & Redirect to Passengers/Drivers page with Link

  madaleines

  committed
  87ea513

  Copy full SHA for 87ea513

• show total earnings and avg rating for Driver

  madaleines

  committed
  fce7360

  Copy full SHA for fce7360

Commits on Apr 5, 2018

• Add Trip From Passenger Autoselect self

  madaleines

  committed
  55e80ea

  Copy full SHA for 55e80ea

• Fix create trip from Passenger

  madaleines

  committed
  07213e6

  Copy full SHA for 07213e6

• Print name of Passenger and hide form with name in creating a trip from Passenger page

  madaleines

  committed
  6d8e8db

  Copy full SHA for 6d8e8db

• Make Driver Available

  madaleines

  committed
  dcb8c49

  Copy full SHA for dcb8c49

• If/Else for Date under Trip form & begin defining available/unavailable method in driver model

  madaleines

  committed
  15bfb60

  Copy full SHA for 15bfb60

• Select first Available Driver if they are online from Passenger New Trip Page

  madaleines

  committed
  32b4a57

  Copy full SHA for 32b4a57

• Debug Create New Trip From Passenger

  madaleines

  committed
  d10f9f7

  Copy full SHA for d10f9f7

• Merge pull request #4 from Oh-KPond/feature_driver-status

  Show description for 9b30c04
  Oh-KPond

  authored
  9b30c04

  Copy full SHA for 9b30c04

• cleanup

  madaleines

  committed
  601be55

  Copy full SHA for 601be55

• Creates root

  madaleines

  committed
  b8e6443

  Copy full SHA for b8e6443

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

  madaleines

  committed
  3e52a08

  Copy full SHA for 3e52a08

Commits on Apr 6, 2018

• show driver and passenger names in Trip info

  madaleines

  committed
  00154d5

  Copy full SHA for 00154d5

• adds css file structure

  Oh-KPond

  committed
  facb584

  Copy full SHA for facb584

• updates css to compile correctly

  Oh-KPond

  committed
  cfd56f7

  Copy full SHA for cfd56f7

• fixes main compile of css

  Oh-KPond

  committed
  cf7c6a3

  Copy full SHA for cf7c6a3

• Submit rating after trip created

  madaleines

  committed
  e3ba663

  Copy full SHA for e3ba663

• starts styling

  Oh-KPond

  committed
  5a6f9d5

  Copy full SHA for 5a6f9d5

• show cost as decimal with rounded to 2 places

  madaleines

  committed
  08fca50

  Copy full SHA for 08fca50

• Merge pull request #5 from Oh-KPond/feature_errors

  Show description for b618a9c
  Oh-KPond

  authored
  b618a9c

  Copy full SHA for b618a9c

• Merge pull request #6 from Oh-KPond/feature_styles

  Show description for c04660f
  Oh-KPond

  authored
  c04660f

  Copy full SHA for c04660f

• Show No driver Available if none are on passenger side

  madaleines

  committed
  9ac20c6

  Copy full SHA for 9ac20c6

• adds style to drivers

  Oh-KPond

  committed
  9d0c2f1

  Copy full SHA for 9d0c2f1

• makes status show available or unavalible for driver

  Oh-KPond

  committed
  36b2839

  Copy full SHA for 36b2839

Commits on Apr 7, 2018

• Rotate Ride in Progress, Driver N/A or Request a Ride feature

  madaleines

  committed
  aeb748b

  Copy full SHA for aeb748b

• does a bit more styling

  Oh-KPond

  committed
  772eb8f

  Copy full SHA for 772eb8f

• does some passenger styling

  Oh-KPond

  committed
  4d005c5

  Copy full SHA for 4d005c5