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

Octos- Analisa & Ari- Rideshare- Rails #23

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

Octos- Analisa & Ari- Rideshare- Rails #23

wants to merge 65 commits into from

Commits on Apr 2, 2018

  1. Created a new rails app

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    1442fcc View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. Model files for driver, passenger, and trip

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

  2. Deleted Model, created schema.rb

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

  3. Added Passenger & Driver models

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

  4. Fixed trip model

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

  5. migration up for trips

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

  6. Added in reference to Passenger ID and Driver ID to trips

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    190ccc6 View commit details
    Browse the repository at this point in the history

  7. Controller and Routes for Driver, Passenger, and Trip

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

  8. Added show/edit/index page to driver, passenger, and trip

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

  9. Index now has lists out Trip Ids with links

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    185a36a View commit details
    Browse the repository at this point in the history

  10. Trip show page with passenger and driver detail

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

Commits on Apr 4, 2018

  1. Started and roughly implemented Edit for Trips, no names yet

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    4c61612 View commit details
    Browse the repository at this point in the history

  2. Made index, show, new views and controller methods

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    5a69d16 View commit details
    Browse the repository at this point in the history

  3. Driver index page with edit and delete options

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

  4. New show and edit page for driver

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

  5. Add driver page/ Nav in Header

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

  6. Implemented Destroy Method for Passenger and also included List of T… 

    …rips taken in Show method
    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    6989de9 View commit details
    Browse the repository at this point in the history

  7. altered method new view and started create method

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    4178f14 View commit details
    Browse the repository at this point in the history

  8. Average rating and Total earnings for driver

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

  9. Added date to list of trips

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

  10. new layout for driver show page

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

  11. form for new driver

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

  12. Merge branch 'master' into working_with_drivers 

    Updating working_with_drivers with master
    @arrriiii
    arrriiii committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    53318f8 View commit details
    Browse the repository at this point in the history

  13. Added paginator to Driver landing page

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

  14. Edit styling

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

  15. Passenger roughly able to be viewed, edited, and deleted. Displays to… 

    …tal amount spent
    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    de557d0 View commit details
    Browse the repository at this point in the history

  16. Fixed Total Earnings/Average Rating for Driver

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

  17. Merge branch 'master' of https://github.com/analisasutherland/ridesha… 

    …re-rails
    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    2ebf0af View commit details
    Browse the repository at this point in the history

  18. Merge branch 'working_with_drivers' 

    Adding drivers to master
    @arrriiii
    arrriiii committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    ffa8dca View commit details
    Browse the repository at this point in the history

  19. Cleaned up Passenger and added lists with pages

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    7318d59 View commit details
    Browse the repository at this point in the history

  20. ordered drivers by name

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

  21. Merge branch 'master' of https://github.com/analisasutherland/ridesha… 

    …re-rails

update master file
    @arrriiii
    arrriiii committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    8f36e56 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2018

  1. Added nested routes for passenger/new trip

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

  2. Added fixed nested route on passenger show page

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

  3. Added gem file for more detailed errors

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    851ac2e View commit details
    Browse the repository at this point in the history

  4. Up to date with Ari

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    6b64402 View commit details
    Browse the repository at this point in the history

  5. Can assign passenger to new trip form

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

  6. Changes that Ari's will overwrite

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    4b6f6cc View commit details
    Browse the repository at this point in the history

  7. more extraneous changes

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    fe84979 View commit details
    Browse the repository at this point in the history

  8. Can now edit trips

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    5c2deff View commit details
    Browse the repository at this point in the history

  9. Validations and Errors implemented

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    680f105 View commit details
    Browse the repository at this point in the history

  10. small changes to rating on trip model

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

  11. Generate random driver to new trip

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

  12. Put in destroy trip method, also put in -bash for a new trip

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 5, 2018
    Configuration menu
    Copy the full SHA
    b23732d View commit details
    Browse the repository at this point in the history

  13. Add rating to unfinished trip

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

Commits on Apr 6, 2018

  1. Fixed list for trip detail

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

  2. Created passenger method for converting cents to dollars

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

  3. New table for trip page

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

  4. layout for passengers & drivers/ updated trip model with helper metho… 

    …d, trip_cost_dollars
    @arrriiii
    arrriiii committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    a1113d4 View commit details
    Browse the repository at this point in the history

  5. New styling for trip index page & driver page/ added helper method fo… 

    …r driver trip_cost_dollars
    @arrriiii
    arrriiii committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    db85f9c View commit details
    Browse the repository at this point in the history

  6. fix layout

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

  7. Changes to be overwritten

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    5d744ef View commit details
    Browse the repository at this point in the history

  8. catching up to Ari's styling

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    ab3d53d View commit details
    Browse the repository at this point in the history

  9. Limited Rating Range in Trip edit view, can only go 0..5 now

    @The-Beez-Kneez
    The-Beez-Kneez committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    fe23b0f View commit details
    Browse the repository at this point in the history

  10. fixed rendering for errors

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

  11. cleaned up form pages

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

  12. new Form_for trips

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

  13. Deletes Driver/Passenger dependencies in model

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

  14. Fixed layout

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

  15. Fixed path for rating unfinished trip

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

Commits on Apr 7, 2018

  1. Form for driver

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

  2. Sort by date

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

  3. removed changes

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

  4. removed more changes

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

  5. removed spacing

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