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.

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

Ampers: Selam and Kaitlin #18

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

Commits on Apr 2, 2018

  1. added rails to project

    kcforsman committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    16bd55a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. Configuration menu
    Copy the full SHA
    4153fda View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d10a3e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    006b41a View commit details
    Browse the repository at this point in the history
  4. added controller for drivers and associated routes, then texted data …

    …population in index: whoot whoot
    SelamawitA committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    aa45de1 View commit details
    Browse the repository at this point in the history
  5. connected foreign keys in driver, passenger, and trips models. Tested…

    … access across schema: pass.
    SelamawitA committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    9916439 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6b2cab5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    99fc620 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    88f8a77 View commit details
    Browse the repository at this point in the history
  9. added logic to calculate total charged to passenger and display it in…

    … the passenger show view
    kcforsman committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    74ae9eb View commit details
    Browse the repository at this point in the history
  10. added nav menu with links to all passengers/all drivers/create new pa…

    …ssenger/create new driver. Also re-added route for trips after git push error.
    SelamawitA committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    a1bff77 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7020ccd View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d4aeb16 View commit details
    Browse the repository at this point in the history
  13. added links for delete and edit of a passenger from passenger details…

    …, and updated delete controller method name and view name to destroy
    kcforsman committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    25ac83d View commit details
    Browse the repository at this point in the history
  14. Addlinks to edit and delete a driver. Also added the ability to see a…

    …ll trips associated with a specific driver and their passenger. Finally, added the method within the driver controller to calculate the amount earned.
    SelamawitA committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    ee08d52 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    7746fd4 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    8848d77 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    2e4a293 View commit details
    Browse the repository at this point in the history
  18. mend

    added ability to create a new passenger and view the edit form
    SelamawitA committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    ff6fcc0 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    4d58fa2 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    dd9b8f6 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    1c1c7b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. Configuration menu
    Copy the full SHA
    fcf3493 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1fa07b0 View commit details
    Browse the repository at this point in the history
  3. added confirmation display message to user after delete is select for…

    … a passenger, driver, or trip. Also added validation on input to forms for the passenger and driver.
    SelamawitA committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    0373fd5 View commit details
    Browse the repository at this point in the history
  4. implemented method to find average rating for a driver in drivers mod…

    …el and added it to drivers#show view
    kcforsman committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    4f643f1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c121cce View commit details
    Browse the repository at this point in the history
  6. added delete functionality to trips through nested routes that redire…

    …ct app to the driver or passenger that deleted the trip
    kcforsman committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    627f243 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    09a9cad View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. added edit functionality to trip that allows you to edit an existing …

    …rating and add a rating to a newly created trip that hasn't yet been set
    kcforsman committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    929bab4 View commit details
    Browse the repository at this point in the history
  2. added functionality that allows trip's rating to be edited only throu…

    …gh a passenger path and add a partial view of the form directly in the trip details page rather than a completely separate view
    kcforsman committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    73a8860 View commit details
    Browse the repository at this point in the history
  3. cleaned up a little of the trip code for the edit and fixed the code …

    …so that partial for rating edits can appear without turning the rating to nil
    kcforsman committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    8545bb5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3f16a1d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    42c33fc View commit details
    Browse the repository at this point in the history
  6. added validation to the forms and error messages for passengers and d…

    …rivers, and started on a validation for trips
    kcforsman committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    174f55f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f76246e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    03f3482 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d1e22ab View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    70a1a9c View commit details
    Browse the repository at this point in the history
  11. added driver status to drivers schema and the ability for driver to b…

    …e available/unavailable.
    SelamawitA committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    6a47e8a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    9379912 View commit details
    Browse the repository at this point in the history
  13. made it so only available drivers are chosen when creating a new trip…

    … and handled message if no drivers are available
    kcforsman committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    f680add View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    94ef523 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. Configuration menu
    Copy the full SHA
    ce25891 View commit details
    Browse the repository at this point in the history
  2. finished the designs for the homepage, passengers and drivers index p…

    …ages, and the trip details page
    kcforsman committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    1106ac6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6334114 View commit details
    Browse the repository at this point in the history
  4. attempted to DRY css....

    kcforsman committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    6bf888e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    25874c7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c750204 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d19b337 View commit details
    Browse the repository at this point in the history
  8. removed comment

    SelamawitA committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    5afad62 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    133b90c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8d6266d View commit details
    Browse the repository at this point in the history