Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

&&: Maddie & Kate #28

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open

&&: Maddie & Kate #28

wants to merge 57 commits into from

Commits on Apr 3, 2018

  1. creates rails app

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    09054af View commit details
    Browse the repository at this point in the history

  2. Create Trip, Driver, & Passenger models

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    6cd6a3f View commit details
    Browse the repository at this point in the history

  3. add route for view all drivers and a controller for drivers

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    0c3e3cc View commit details
    Browse the repository at this point in the history

  4. adds a drivers view

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    6874949 View commit details
    Browse the repository at this point in the history

  5. adds ruby html to view all drivers

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    60ac157 View commit details
    Browse the repository at this point in the history

  6. updates routes to use resources for drivers

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    a115eb2 View commit details
    Browse the repository at this point in the history

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

    Feature all drivers controller
    @madaleines
    madaleines authored Apr 3, 2018
    Configuration menu
    Copy the full SHA
    dab2654 View commit details
    Browse the repository at this point in the history

  8. Rename phone_num column

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    18f4801 View commit details
    Browse the repository at this point in the history

  9. Creates a view for all Passengers

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    ccb4468 View commit details
    Browse the repository at this point in the history

  10. Adds trips controller & view

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    1e0c4c8 View commit details
    Browse the repository at this point in the history

  11. adds foreign keys to trips

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    4524702 View commit details
    Browse the repository at this point in the history

  12. View Individual Passenger Pages

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    6ef71ea View commit details
    Browse the repository at this point in the history

  13. Destroy passenger and makes Foreign key Passenger_id nil

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    a7d9ffa View commit details
    Browse the repository at this point in the history

  14. Clean up Passenger Controller

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    5969967 View commit details
    Browse the repository at this point in the history

  15. modifies driver controller for CRUD

    @Oh-KPond
    Oh-KPond committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    8ac1348 View commit details
    Browse the repository at this point in the history

  16. Show list of linked Trips under Individual Passenger

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    253d7c5 View commit details
    Browse the repository at this point in the history

  17. Calculates total_charge for Passenger's Trips

    @madaleines
    madaleines committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    029fd41 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. Validate User Input for Creating a Passenger

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    5f9966c View commit details
    Browse the repository at this point in the history

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

    Looks great!
    @Oh-KPond
    Oh-KPond authored Apr 4, 2018
    Configuration menu
    Copy the full SHA
    8a13931 View commit details
    Browse the repository at this point in the history

  3. Creates view for Trip

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    b92b808 View commit details
    Browse the repository at this point in the history

  4. Link to Passenger page from Trip View

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    29724a4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:Oh-KPond/rideshare-rails into fea… 

    …ture_view-single-driver
    @Oh-KPond
    Oh-KPond committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    9a87405 View commit details
    Browse the repository at this point in the history

  6. Creates view of single driver

    @Oh-KPond
    Oh-KPond committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    69b4949 View commit details
    Browse the repository at this point in the history

  7. creates validation for driver forms

    @Oh-KPond
    Oh-KPond committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    3a3fc9f View commit details
    Browse the repository at this point in the history

  8. adds links to the nav for drivers and add a driver

    @Oh-KPond
    Oh-KPond committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    c83a5cf View commit details
    Browse the repository at this point in the history

  9. adds driver to Trip view

    @Oh-KPond
    Oh-KPond committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    fe1ef29 View commit details
    Browse the repository at this point in the history

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

    Feature view single driver
    @madaleines
    madaleines authored Apr 4, 2018
    Configuration menu
    Copy the full SHA
    7b8b038 View commit details
    Browse the repository at this point in the history

  11. Trip Partial Form

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    0a6e743 View commit details
    Browse the repository at this point in the history

  12. Click on individual Trip from View page to siew details of Trip

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    f23386f View commit details
    Browse the repository at this point in the history

  13. Show Deleted Passenger/Driver on Trip Info & Redirect to Passengers/D… 

    …rivers page with Link
    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    87ea513 View commit details
    Browse the repository at this point in the history

  14. show total earnings and avg rating for Driver

    @madaleines
    madaleines committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    fce7360 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Add Trip From Passenger Autoselect self

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    55e80ea View commit details
    Browse the repository at this point in the history

  2. Fix create trip from Passenger

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    07213e6 View commit details
    Browse the repository at this point in the history

  3. Print name of Passenger and hide form with name in creating a trip fr… 

    …om Passenger page
    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    6d8e8db View commit details
    Browse the repository at this point in the history

  4. Make Driver Available

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    dcb8c49 View commit details
    Browse the repository at this point in the history

  5. If/Else for Date under Trip form & begin defining available/unavailab… 

    …le method in driver model
    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    15bfb60 View commit details
    Browse the repository at this point in the history

  6. Select first Available Driver if they are online from Passenger New T… 

    …rip Page
    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    32b4a57 View commit details
    Browse the repository at this point in the history

  7. Debug Create New Trip From Passenger

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    d10f9f7 View commit details
    Browse the repository at this point in the history

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

    Feature driver status
    @Oh-KPond
    Oh-KPond authored Apr 5, 2018
    Configuration menu
    Copy the full SHA
    9b30c04 View commit details
    Browse the repository at this point in the history

  9. cleanup

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    601be55 View commit details
    Browse the repository at this point in the history

  10. Creates root

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    b8e6443 View commit details
    Browse the repository at this point in the history

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

    @madaleines
    madaleines committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    3e52a08 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. show driver and passenger names in Trip info

    @madaleines
    madaleines committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    00154d5 View commit details
    Browse the repository at this point in the history

  2. adds css file structure

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    facb584 View commit details
    Browse the repository at this point in the history

  3. updates css to compile correctly

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    cfd56f7 View commit details
    Browse the repository at this point in the history

  4. fixes main compile of css

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    cf7c6a3 View commit details
    Browse the repository at this point in the history

  5. Submit rating after trip created

    @madaleines
    madaleines committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    e3ba663 View commit details
    Browse the repository at this point in the history

  6. starts styling

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    5a6f9d5 View commit details
    Browse the repository at this point in the history

  7. show cost as decimal with rounded to 2 places

    @madaleines
    madaleines committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    08fca50 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5 from Oh-KPond/feature_errors 

    Feature errors
    @Oh-KPond
    Oh-KPond authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    b618a9c View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6 from Oh-KPond/feature_styles 

    starts styling
    @Oh-KPond
    Oh-KPond authored Apr 6, 2018
    Configuration menu
    Copy the full SHA
    c04660f View commit details
    Browse the repository at this point in the history

  10. Show No driver Available if none are on passenger side

    @madaleines
    madaleines committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    9ac20c6 View commit details
    Browse the repository at this point in the history

  11. adds style to drivers

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    9d0c2f1 View commit details
    Browse the repository at this point in the history

  12. makes status show available or unavalible for driver

    @Oh-KPond
    Oh-KPond committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    36b2839 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

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

    @madaleines
    madaleines committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    aeb748b View commit details
    Browse the repository at this point in the history

  2. does a bit more styling

    @Oh-KPond
    Oh-KPond committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    772eb8f View commit details
    Browse the repository at this point in the history

  3. does some passenger styling

    @Oh-KPond
    Oh-KPond committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    4d005c5 View commit details
    Browse the repository at this point in the history