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

Jump to bottom

Ports - Amy M Faiza A #21

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

Ports - Amy M Faiza A #21

wants to merge 72 commits into from

Commits on Apr 15, 2019

  1. Initial commit with controllers for Drivers and Passengers

    @Faiza1987
    Faiza1987 committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    dc6014c View commit details
    Browse the repository at this point in the history

  2. added initial models to rails app

    @amyesh
    amyesh committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    11c5ee5 View commit details
    Browse the repository at this point in the history

  3. resolved git conflicts

    @amyesh
    amyesh committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    77d5582 View commit details
    Browse the repository at this point in the history

  4. Resolved conflicts and created trip controller and corssponding view

    @Faiza1987
    Faiza1987 committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    54b9100 View commit details
    Browse the repository at this point in the history

  5. Add routes resources, add code to list drivers in controller and view

    @Faiza1987
    Faiza1987 committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    c73fbe2 View commit details
    Browse the repository at this point in the history

  6. added view capability for passengers

    @amyesh
    amyesh committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    7af96de View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/amyesh/ride-share-rails 

    added passenger functionality
    @amyesh
    amyesh committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    b08d8ce View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. Remove spurious model tests

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    d201937 View commit details
    Browse the repository at this point in the history

  2. added Homepages controller

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    d72faed View commit details
    Browse the repository at this point in the history

  3. added Homepages controller

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    ef65843 View commit details
    Browse the repository at this point in the history

  4. Committing so I can pull

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    62b4e65 View commit details
    Browse the repository at this point in the history

  5. Committing pull

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    be7c7f5 View commit details
    Browse the repository at this point in the history

  6. new commit of test file

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    3e4c2a8 View commit details
    Browse the repository at this point in the history

  7. added relationships to driver and trip

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    92b2fad View commit details
    Browse the repository at this point in the history

  8. Added model relationship to driver. Added link_to to driver names

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    f980b0e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/amyesh/ride-share-rails

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    8ef388c View commit details
    Browse the repository at this point in the history

  10. Added reference to driver and passenger in trips

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    108c475 View commit details
    Browse the repository at this point in the history

  11. Added index test for Passenger. Fixed relationship in Trips model.

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    bd71180 View commit details
    Browse the repository at this point in the history

  12. added tests to driver index and show actions

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    419f403 View commit details
    Browse the repository at this point in the history

  13. Fixed bug in yml file

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    ca46856 View commit details
    Browse the repository at this point in the history

  14. Added passenger show method tests

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    2febd9e View commit details
    Browse the repository at this point in the history

  15. Added new and create method. Added strong params for driver

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    ef3af17 View commit details
    Browse the repository at this point in the history

  16. added tests and code to show method

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    af76dc0 View commit details
    Browse the repository at this point in the history

  17. committed merge conflicts

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    bc18ab7 View commit details
    Browse the repository at this point in the history

  18. added view pages for all basic actions

    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    f8e584f View commit details
    Browse the repository at this point in the history

  19. Added test for create method

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    009a5ee View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.com/amyesh/ride-share-rails

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    5c0e671 View commit details
    Browse the repository at this point in the history

  21. added tests and code for edit and update actions also added validatio… 

    …ns for driver and passenger
    @amyesh
    amyesh committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    2164ef8 View commit details
    Browse the repository at this point in the history

  22. Added further tests for create and destroy methods.

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    0d82d57 View commit details
    Browse the repository at this point in the history

  23. Resolved git conflicts

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    d98caa9 View commit details
    Browse the repository at this point in the history

  24. Fixed syntax errors in test

    @Faiza1987
    Faiza1987 committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    bda7b9b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. Created partial form for Driver and rendered it in new

    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    7aa4b76 View commit details
    Browse the repository at this point in the history

  2. Added link buttons to point to each page. Created partial form for pa… 

    …ssengers and rendered it in New and Edit views
    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    486d855 View commit details
    Browse the repository at this point in the history

  3. Fixed Add and Delete Actions.

    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    51bda70 View commit details
    Browse the repository at this point in the history

  4. Fixed Add and Delete for Passengers

    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    5a2e509 View commit details
    Browse the repository at this point in the history

  5. Added tables to Driver and Passenger show view, added trip index cont… 

    …roller method, added trip model methods
    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    6701e3d View commit details
    Browse the repository at this point in the history

  6. Added average_rating method in Driver model

    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    8cef669 View commit details
    Browse the repository at this point in the history

  7. Fixed average_rating method in Driver model

    @Faiza1987
    Faiza1987 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    fba22ec View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Added Passenger net_expenditures method in model and called it in view.

    @Faiza1987
    Faiza1987 committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    b56a9a4 View commit details
    Browse the repository at this point in the history

  2. added styling to site

    @amyesh
    amyesh committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    175aa17 View commit details
    Browse the repository at this point in the history

  3. "Fixed Merge Conflicts"

    @amyesh
    amyesh committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    c7a4645 View commit details
    Browse the repository at this point in the history

  4. Fixed a couple bugs in layout

    @amyesh
    amyesh committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    f8c5f70 View commit details
    Browse the repository at this point in the history

  5. Added trip details to trip show view.

    @Faiza1987
    Faiza1987 committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    83d6c2a View commit details
    Browse the repository at this point in the history

  6. added driver columns and toggle_availability tests and method

    @amyesh
    amyesh committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    228570c View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. added availability toggle button to driver page

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    e438d3c View commit details
    Browse the repository at this point in the history

  2. added tests for trip controller index and show methods

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    a66dd68 View commit details
    Browse the repository at this point in the history

  3. added edit method and forms for trip

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    2346408 View commit details
    Browse the repository at this point in the history

  4. added edit test for passenger controller

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    fed1a3a View commit details
    Browse the repository at this point in the history

  5. added edit test for trips controller

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    74c865f View commit details
    Browse the repository at this point in the history

  6. added test for update method in trip controller

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    b4242fe View commit details
    Browse the repository at this point in the history

  7. added styling to tables

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    bf5236b View commit details
    Browse the repository at this point in the history

  8. added create method and tests and template

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    4f1deae View commit details
    Browse the repository at this point in the history

  9. added request trip button to passenger show page

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    c137cf9 View commit details
    Browse the repository at this point in the history

  10. Passenger new test

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    07fda2c View commit details
    Browse the repository at this point in the history

  11. Passenger new test

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    801fce5 View commit details
    Browse the repository at this point in the history

  12. added drop down menu to trip edit form

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    f419535 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/amyesh/ride-share-rails

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    ddecb83 View commit details
    Browse the repository at this point in the history

  14. fixed merge conflict

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    6dd1b29 View commit details
    Browse the repository at this point in the history

  15. removed validation for trip rading

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    a2a2fc5 View commit details
    Browse the repository at this point in the history

  16. Display car make and model

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    12f3803 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/amyesh/ride-share-rails

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    6f91ea6 View commit details
    Browse the repository at this point in the history

  18. Rever changes made to rating

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    cc7afb9 View commit details
    Browse the repository at this point in the history

  19. fixed make model error

    @amyesh
    amyesh committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    0a9de26 View commit details
    Browse the repository at this point in the history

  20. Remove car_make and car_model from schema

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    4e163ab View commit details
    Browse the repository at this point in the history

  21. Remove pry

    @Faiza1987
    Faiza1987 committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    463520a View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2019

  1. added delete cascading logic to trip foreign keys

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    928f740 View commit details
    Browse the repository at this point in the history

  2. removed pry from trips controller

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    27e7fd0 View commit details
    Browse the repository at this point in the history

  3. added picture format

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    7454099 View commit details
    Browse the repository at this point in the history

  4. updated test

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    29540a7 View commit details
    Browse the repository at this point in the history

  5. made driver and passenger trip details linked in respective show pages

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    a5ca086 View commit details
    Browse the repository at this point in the history

  6. added functionality so that passenger cannot request trip unless they… 

    … have submitting a rating for their existing trip
    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    8d3ce78 View commit details
    Browse the repository at this point in the history

  7. fixed faulty migrations

    @amyesh
    amyesh committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    b961ec9 View commit details
    Browse the repository at this point in the history