Code

Kiera & Luxi - Rideshare - Octos#29

Code

Open

Lindseyls wants to merge 45 commits intoAda-C9:masterAda-C9/rideshare-rails:masterfrom Krashaune:masterKrashaune/rideshare-rails:masterCopy head branch name to clipboard

+2,325

Commits

Commits on Apr 3, 2018

• Forked and Cloned rideshare. Ran rails new.

  Lindseyls

  committed
  e88c70b

  Copy full SHA for e88c70b

• Generated and updated the trip controller and routes. Generated the trip model and database.

  Lindseyls

  committed
  d8a42d8

  Copy full SHA for d8a42d8

• Generated passenger controller and model. Updated controller methods, and routes

  Krashaune

  committed
  a233dd0

  Copy full SHA for a233dd0

• Generated and updated the driver route, model, and controller

  Lindseyls

  committed
  9549ad7

  Copy full SHA for 9549ad7

• Adding the foreign_key for driver and passenger into trips

  Lindseyls

  committed
  538692e

  Copy full SHA for 538692e

• Updated model relationships. Added seed data.

  Krashaune

  committed
  aa655e6

  Copy full SHA for aa655e6

Commits on Apr 4, 2018

• We accidently created a rails folder withint the rails folder. So we have to reconfigure the origin rails folder and moved all the files and recreated models and controllers

  Lindseyls

  committed
  092a0e7

  Copy full SHA for 092a0e7

• Troubleshooted seed data, created database and migrations

  Krashaune

  committed
  b4d831f

  Copy full SHA for b4d831f

• Added basic elements to index and show views for passenger. Added basic css to application such as nav bar and page header

  Krashaune

  committed
  b22b33d

  Copy full SHA for b22b33d

• Updated controller. Created index.html.erb and show.html.erb.

  Lindseyls

  committed
  64948d3

  Copy full SHA for 64948d3

• making sure all udpates are up to date

  Lindseyls

  committed
  895e81d

  Copy full SHA for 895e81d

• Merge branch 'master' of https://github.com/Krashaune/rideshare-rails

  Lindseyls

  committed
  9ea6c23

  Copy full SHA for 9ea6c23

• Updated the show.html.erb for driver

  Lindseyls

  committed
  593c0d9

  Copy full SHA for 593c0d9

• Added division to cost to display on show pages for driver and passenger

  Krashaune

  committed
  495421f

  Copy full SHA for 495421f

• Added forms view for passenger and driver. Updated passenger index view.

  Krashaune

  committed
  69b49e3

  Copy full SHA for 69b49e3

Commits on Apr 5, 2018

• Changed passenger phone num field to a string. Added method to passenger model to calculate total spent. Added skeleton code for request trip method in model. Updated link_to delete on details show…

  Show description for c4464fc
  Krashaune

  committed
  c4464fc

  Copy full SHA for c4464fc

• reorganized how passenger trip data loop into list items. added styling to passenger trips to display: grid

  Krashaune

  committed
  b6bfabf

  Copy full SHA for b6bfabf

• Add CSS to nav bar

  Krashaune

  committed
  f6e7c93

  Copy full SHA for f6e7c93

• Added two columns car_make and car_model to driver

  Lindseyls

  committed
  bdf8309

  Copy full SHA for bdf8309

• Add CSS updates to passenger trips table and details page

  Krashaune

  committed
  2fbec32

  Copy full SHA for 2fbec32

• Created and updated the edit.html.erb for driver

  Lindseyls

  committed
  d389458

  Copy full SHA for d389458

• Created and updated the create.html.erb for driver

  Lindseyls

  committed
  34a2395

  Copy full SHA for 34a2395

• Update driver controller

  Lindseyls

  committed
  3095899

  Copy full SHA for 3095899

• Updated the show.html.erb and updated the list to a table

  Lindseyls

  committed
  56cca95

  Copy full SHA for 56cca95

• Added space under navbar

  Krashaune

  committed
  8998cbd

  Copy full SHA for 8998cbd

• added better errors to gemfile

  Krashaune

  committed
  0c22daa

  Copy full SHA for 0c22daa

• Updated the show.html.erb with a working table

  Lindseyls

  committed
  37b75dd

  Copy full SHA for 37b75dd

• Merge branch 'luxi_branch'

  Lindseyls

  committed
  c242681

  Copy full SHA for c242681

• Updated the show.html.erb on the table with updated info

  Lindseyls

  committed
  1501240

  Copy full SHA for 1501240

• Created the link between the trip id and the trip show page

  Lindseyls

  committed
  21a7c65

  Copy full SHA for 21a7c65

• Updated the driver name to a link on the trip show page to go to the driver's show page

  Lindseyls

  committed
  baa5923

  Copy full SHA for baa5923

• updated passenger request trip method in model. updated show.html.erb to contain a link to request trip. updated trip controller to support creating a trip from passenger and routing correctly. Add…

  Show description for 74f8edb
  Krashaune

  committed
  74f8edb

  Copy full SHA for 74f8edb

Commits on Apr 6, 2018

• Added the total_revenue and average rating method to the driver.rb. Updated the driver show page with the info such as average rating and total revenue. Updated the index page to include the averag…

  Show description for 3694a98
  Lindseyls

  committed
  3694a98

  Copy full SHA for 3694a98

• Updated the passenger show page

  Lindseyls

  committed
  976bac4

  Copy full SHA for 976bac4

• Updated the trip show page to have a link that goes directly to the passenger show page

  Lindseyls

  committed
  40d7a54

  Copy full SHA for 40d7a54

• Created error_message partial and udpated the partial form. Updated the controller with render in create and update methods

  Lindseyls

  committed
  1480eb3

  Copy full SHA for 1480eb3

• Updated date on show.html.erb to fix dates. Updated partial form for driver error_messages.

  Krashaune

  committed
  5aa1f4e

  Copy full SHA for 5aa1f4e

• Created and updated our homepage using the trip#index. Updated application.html.erb to link the nav to the homepage.

  Lindseyls

  committed
  6215742

  Copy full SHA for 6215742

• Working on the delete path from passenger show page to delete the whole trip.

  Lindseyls

  committed
  24194f6

  Copy full SHA for 24194f6

• Updated the trip.controller.rb#delete method to direct the path to the passenger show page when a passenger is deleted

  Lindseyls

  committed
  a28b3e6

  Copy full SHA for a28b3e6

• Added edit trip and edit passenger buttons to the passengers view page. Added a potential image for the homepage.

  Krashaune

  committed
  99d3e50

  Copy full SHA for 99d3e50

Commits on Apr 7, 2018

• Added new nested routes for driver and passenger. Updated driver view to look like passenger view. updated delete route to go to nested path. made progress on trips destroy method in the controller.

  Krashaune

  committed
  6b31fbc

  Copy full SHA for 6b31fbc

• Update the trip_controller.rb#destroy method to successfully delete both passenger trip and driver trip and then go back to the show pages

  Lindseyls

  committed
  6416235

  Copy full SHA for 6416235

• Created edit.html.erb for trip so that we can edit trips.

  Lindseyls

  committed
  1a9a5bd

  Copy full SHA for 1a9a5bd

• Updated trips controller update method, Added validations to trips model, added errors messages partial to trips edit form

  Krashaune

  committed
  927676d

  Copy full SHA for 927676d