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

RideShare - Carets - Marisa Morris & Isabel Suchanek #14

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

RideShare - Carets - Marisa Morris & Isabel Suchanek #14

wants to merge 83 commits into from

Commits on Oct 2, 2017

  1. Controllers for Drivers, Passengers, and Trips created.

    hellomarisamorris committed Oct 2, 2017
    Configuration menu
    Copy the full SHA
    d3f64fa View commit details
    Browse the repository at this point in the history

  2. Set up controllers and models

    @isabeldepapel
    isabeldepapel committed Oct 2, 2017
    Configuration menu
    Copy the full SHA
    8af9370 View commit details
    Browse the repository at this point in the history

  3. Created routes.

    hellomarisamorris committed Oct 2, 2017
    Configuration menu
    Copy the full SHA
    64e10b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2017

  1. Created drivers and passenger list and create passenger link

    hellomarisamorris committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    038f092 View commit details
    Browse the repository at this point in the history

  2. Added new driver form and partial

    @isabeldepapel
    isabeldepapel committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    7cd056f View commit details
    Browse the repository at this point in the history

  3. Added links for all drivers and all passengers.

    hellomarisamorris committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    4edbf33 View commit details
    Browse the repository at this point in the history

  4. Added home page and a nav that holds all of the links to passengers, … 

    …drivers, new driver, and new passenger.
    hellomarisamorris committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    ec0926d View commit details
    Browse the repository at this point in the history

  5. added show and (broken) destroy for driver

    @isabeldepapel
    isabeldepapel committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    78f8038 View commit details
    Browse the repository at this point in the history

  6. Created passenger form partial and can edit passenger.

    hellomarisamorris committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    113cf1a View commit details
    Browse the repository at this point in the history

  7. Added average rating for drivers and trip lists

    @isabeldepapel
    isabeldepapel committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    291b383 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2017

  1. Deleted random stuff from driver show

    @isabeldepapel
    isabeldepapel committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    0d35d85 View commit details
    Browse the repository at this point in the history

  2. added create trip method and moved average rating method to model

    hellomarisamorris committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    360a67c View commit details
    Browse the repository at this point in the history

  3. Added trips total method to passenger model

    hellomarisamorris committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    a37724f View commit details
    Browse the repository at this point in the history

  4. Added a link_to for the create trip in addition to the already made b… 

    …utton to for the sake of uniformity. commented out button_to
    hellomarisamorris committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    72e6cfb View commit details
    Browse the repository at this point in the history

  5. Added methods for total cost to driver and passenger

    @isabeldepapel
    isabeldepapel committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    6960882 View commit details
    Browse the repository at this point in the history

  6. Added trip detail to passenger detail

    @isabeldepapel
    isabeldepapel committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    56e5d1b View commit details
    Browse the repository at this point in the history

  7. Added passenger to trip show page.

    hellomarisamorris committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    401b8da View commit details
    Browse the repository at this point in the history

  8. Added links to driver and passenger pages

    hellomarisamorris committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    3434832 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

  1. Added delete trip option in trips details page.

    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    7654c5d View commit details
    Browse the repository at this point in the history

  2. Implemented edit trip

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    f6196df View commit details
    Browse the repository at this point in the history

  3. select on trip edit displays current passenger

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    a3ab0f0 View commit details
    Browse the repository at this point in the history

  4. Added error messages if form fields are not completed for both driver… 

    … and passengers.
    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    ed56212 View commit details
    Browse the repository at this point in the history

  5. added an error message if the edit trip form is not completely filled… 

    … out in editing process.
    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    5dfc4ff View commit details
    Browse the repository at this point in the history

  6. form for edit trip was not allowing a passenger to add a new trip aft… 

    …er adding a rating validations so I added a default rating to the new trip action
    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    b012a10 View commit details
    Browse the repository at this point in the history

  7. added commented message explaining changes from previous commit

    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    0341bcc View commit details
    Browse the repository at this point in the history

  8. edited seeds so cost reads as decimal equivalent, not int

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    0cdbd98 View commit details
    Browse the repository at this point in the history

  9. changed methods and views to properly format cost as currency

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    a06ff13 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    eacf8c4 View commit details
    Browse the repository at this point in the history

  11. added fonts and styled nav-bar

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    a1dbefc View commit details
    Browse the repository at this point in the history

  12. Added number field to edit trip rating

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    3f4c40e View commit details
    Browse the repository at this point in the history

  13. Added link to rate unrated rides.

    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    c64494c View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    2ae099b View commit details
    Browse the repository at this point in the history

  15. removed duplicate trip.rating

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    94092b2 View commit details
    Browse the repository at this point in the history

  16. fixed bug in average rating

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    fa71121 View commit details
    Browse the repository at this point in the history

  17. moved home page styling from app css to home css

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    1ed8233 View commit details
    Browse the repository at this point in the history

  18. more styling for driver details

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    242f705 View commit details
    Browse the repository at this point in the history

  19. added styling for nav, passenger, and driver pages.

    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    afceceb View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    a18d286 View commit details
    Browse the repository at this point in the history

  21. replaced deleted css text

    @isabeldepapel
    isabeldepapel committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    d33b508 View commit details
    Browse the repository at this point in the history

  22. Images on driver and passenger index pages are now links to their pages.

    hellomarisamorris committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    3be405a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2017

  1. made trip rating radio buttons

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    132e52a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    a2053c0 View commit details
    Browse the repository at this point in the history

  3. hide trip rating if 0

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    4e3681c View commit details
    Browse the repository at this point in the history

  4. added flash notices for succesfully creating/updating

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    59b603c View commit details
    Browse the repository at this point in the history

  5. added home page image

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    2353c0b View commit details
    Browse the repository at this point in the history

  6. added hover to drivers and passengers index page.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    00b47ec View commit details
    Browse the repository at this point in the history

  7. added home to nav bar.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    d1cf4ce View commit details
    Browse the repository at this point in the history

  8. added hover effects to nav bar and passenger and driver icons.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    45708bf View commit details
    Browse the repository at this point in the history

  9. updated hover effects.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    457d23c View commit details
    Browse the repository at this point in the history

  10. Adjusted the passenge/driver index pages. images are now centered.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    7623bbe View commit details
    Browse the repository at this point in the history

  11. styled buttons on driver detail page

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    36435c2 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    23572cb View commit details
    Browse the repository at this point in the history

  13. add flash notice to create trip from passenger detail

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    505a055 View commit details
    Browse the repository at this point in the history

  14. removed home option in nav bar and expanded widened the ul holding al… 

    …l drivers and passengers to account for one more per row
    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    7e0d9f8 View commit details
    Browse the repository at this point in the history

  15. made trips list a table in driver detail

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    0256be4 View commit details
    Browse the repository at this point in the history

  16. add better_errors and binding_of_caller to gemfile

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    17ec311 View commit details
    Browse the repository at this point in the history

  17. made trips list a table in passenger detail

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    ef3e51c View commit details
    Browse the repository at this point in the history

  18. add flash error when driver or passenger not found

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    f489408 View commit details
    Browse the repository at this point in the history

  19. fix flash notice/error color styling

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    3b51a61 View commit details
    Browse the repository at this point in the history

  20. style tables in passenger and driver details

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    33256c2 View commit details
    Browse the repository at this point in the history

  21. add flash notice to trip detail page

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    f5ecf1b View commit details
    Browse the repository at this point in the history

  22. created button_to's in place of link_to on passenger show pages.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    8095f7f View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    a223ca0 View commit details
    Browse the repository at this point in the history

  24. change font color for rate-me link

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    c30fa12 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    d45b411 View commit details
    Browse the repository at this point in the history

  26. added toggle sort links to table headings

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    12935e0 View commit details
    Browse the repository at this point in the history

  27. sanitized input for toggle sorting in passenger detail views

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    dba0446 View commit details
    Browse the repository at this point in the history

  28. updated styling on passenger page.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    d162792 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    05e81c4 View commit details
    Browse the repository at this point in the history

  30. add up/down arrow icons to table sort

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    dbb7374 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    2ff60a6 View commit details
    Browse the repository at this point in the history

  32. added hover to table

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    995dcc9 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' of https://github.com/HelloMarisaMorris/ridesha… 

    …re-rails
    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    679205b View commit details
    Browse the repository at this point in the history

  34. fixed css syntax error

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    98500ed View commit details
    Browse the repository at this point in the history

  35. fix css syntax error

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    a205c8f View commit details
    Browse the repository at this point in the history

  36. add favicon

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    2333036 View commit details
    Browse the repository at this point in the history

  37. fixed home page styling

    @isabeldepapel
    isabeldepapel committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    c0385e9 View commit details
    Browse the repository at this point in the history

  38. added paginate to limit passengers and drivers amount on index pages.

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    d29bb50 View commit details
    Browse the repository at this point in the history

  39. added paginate to limit passengers and drivers amount on index pages." 

    Merge branch 'master' of https://github.com/HelloMarisaMorris/rideshare-rails
    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    1bd86e6 View commit details
    Browse the repository at this point in the history

  40. Displaying 30 passengers and drivers per page. Styled the option to c… 

    …hoose which page number to display.
    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    2fa6e7b View commit details
    Browse the repository at this point in the history

  41. styled page numbers further

    hellomarisamorris committed Oct 6, 2017
    Configuration menu
    Copy the full SHA
    15ecba6 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2017

  1. added more styling to pagination

    hellomarisamorris committed Oct 7, 2017
    Configuration menu
    Copy the full SHA
    84120f9 View commit details
    Browse the repository at this point in the history

  2. precompile assets ??

    @isabeldepapel
    isabeldepapel committed Oct 7, 2017
    Configuration menu
    Copy the full SHA
    b30af9e View commit details
    Browse the repository at this point in the history