Code

Sockets - Hana && Maria#19

Code

Open

hanalways wants to merge 61 commits intoAda-C11:masterAda-C11/ride-share-rails:masterfrom hanalways:masterhanalways/ride-share-rails:masterCopy head branch name to clipboard

+2,617-191

Commits

Commits on Apr 15, 2019

• Run new rails

  hanalways

  committed
  c5b2d6f

  Copy full SHA for c5b2d6f

• Set up Trip, Passenger, and Driver models and relations

  hanalways

  committed
  0b00e7f

  Copy full SHA for 0b00e7f

• Added RESTful routes

  hanalways

  committed
  8f9e429

  Copy full SHA for 8f9e429

• Add controller and view for trips

  hanalways

  committed
  bcec0de

  Copy full SHA for bcec0de

• Semantic HTML

  hanalways

  committed
  339dcc6

  Copy full SHA for 339dcc6

Commits on Apr 16, 2019

• added drivers controller, index

  MariaWissler

  committed
  e5638fe

  Copy full SHA for e5638fe

• Update view to list all drivers

  hanalways

  committed
  86b7509

  Copy full SHA for 86b7509

• Create passenger model, index action

  hanalways

  committed
  5de2616

  Copy full SHA for 5de2616

• Scaffolding code to show and form

  hanalways

  committed
  39c1b88

  Copy full SHA for 39c1b88

• Update controller with new and create

  hanalways

  committed
  5a13709

  Copy full SHA for 5a13709

• added index for drivers, rating comment in model for driver, added comment in driver controller

  MariaWissler

  committed
  6a98154

  Copy full SHA for 6a98154

• added index for drivers, rating comment in model for driver, added comment in driver controller

  MariaWissler

  committed
  6602bd6

  Copy full SHA for 6602bd6

• refactored a little drivers

  MariaWissler

  committed
  7b23166

  Copy full SHA for 7b23166

• resolving merge conflicts

  hanalways

  committed
  6fa8ded

  Copy full SHA for 6fa8ded

• resolving merge conflicts

  hanalways

  committed
  060cee2

  Copy full SHA for 060cee2

• resolving merge conflicts

  hanalways

  committed
  0eea054

  Copy full SHA for 0eea054

• scaffolding code for index

  hanalways

  committed
  d0f15f8

  Copy full SHA for d0f15f8

• views and action for new passenger

  hanalways

  committed
  f8491d0

  Copy full SHA for f8491d0

• update scaffolding code for show

  hanalways

  committed
  17bdb48

  Copy full SHA for 17bdb48

• work out bugs in form

  hanalways

  committed
  633ee6a

  Copy full SHA for 633ee6a

• Add validation to passenger

  hanalways

  committed
  0886a72

  Copy full SHA for 0886a72

• add passenger validation to form

  hanalways

  committed
  5a380e8

  Copy full SHA for 5a380e8

• trip table with links

  hanalways

  committed
  c493d02

  Copy full SHA for c493d02

• add styling and content

  hanalways

  committed
  a59b195

  Copy full SHA for a59b195

• added drivers controller, rating, and migration for car_make and car_model

  MariaWissler

  committed
  3a741fb

  Copy full SHA for 3a741fb

• added form to create new driver

  MariaWissler

  committed
  a289732

  Copy full SHA for a289732

Commits on Apr 17, 2019

• Remove spurious model tests

  hanalways

  committed
  fc187d1

  Copy full SHA for fc187d1

• add some new views

  hanalways

  committed
  057ac31

  Copy full SHA for 057ac31

• index tests

  hanalways

  committed
  61530b1

  Copy full SHA for 61530b1

• added show view to drivers, shows average rating and total earnings, shows image for fanciness

  MariaWissler

  committed
  974292c

  Copy full SHA for 974292c

• add nullify to models

  hanalways

  committed
  a170a76

  Copy full SHA for a170a76

• removed conditional to delete drivers

  MariaWissler

  committed
  331a87b

  Copy full SHA for 331a87b

• created method to find available driver to create trip, created trip-create method, added route for trips

  MariaWissler

  committed
  d404b8f

  Copy full SHA for d404b8f

• fix conflicts in routing

  MariaWissler

  committed
  f511e55

  Copy full SHA for f511e55

Commits on Apr 18, 2019

• added request a trip method on passenger working, migrate driver to add status

  MariaWissler

  committed
  d3fb82e

  Copy full SHA for d3fb82e

• edit tests and update with redirect

  hanalways

  committed
  771acdf

  Copy full SHA for 771acdf

• update tests and redirects

  hanalways

  committed
  c479a42

  Copy full SHA for c479a42

• create tests written and passing

  hanalways

  committed
  797fdbe

  Copy full SHA for 797fdbe

• destroy tests

  hanalways

  committed
  c969e01

  Copy full SHA for c969e01

• Merge branch 'master' into maria-driver-branch

  hanalways

  committed
  51120c8

  Copy full SHA for 51120c8

• index show and edit tests passing

  hanalways

  committed
  b642cab

  Copy full SHA for b642cab

• Merge branch 'maria-driver-branch' of https://github.com/hanalways/ride-share-rails into maria-driver-branch

  hanalways

  committed
  3312f47

  Copy full SHA for 3312f47

• driver update tests pass

  hanalways

  committed
  cf72b7b

  Copy full SHA for cf72b7b

• destroy test passing

  hanalways

  committed
  c192ce0

  Copy full SHA for c192ce0

Commits on Apr 19, 2019

• logic for total amount and implemented in view

  hanalways

  committed
  d7af068

  Copy full SHA for d7af068

• add validation

  hanalways

  committed
  d29cca9

  Copy full SHA for d29cca9

• updated trips controller to request trip info in passenger show, updated routes

  MariaWissler

  committed
  bae5fe9

  Copy full SHA for bae5fe9

• update trips controller, driver model, trip edit view and added status change for passenger and driver not on trip

  MariaWissler

  committed
  2b5ff4b

  Copy full SHA for 2b5ff4b

• fixed update trip method and added method to update ratings, working

  MariaWissler

  committed
  b0d4644

  Copy full SHA for b0d4644

• debug trip rating validation

  hanalways

  committed
  d7514ff

  Copy full SHA for d7514ff

• DRY up total cost method

  hanalways

  committed
  56cbade

  Copy full SHA for 56cbade

• add rating functionality

  hanalways

  committed
  10e7413

  Copy full SHA for 10e7413

• tests for show and edit, create fallback redirection

  hanalways

  committed
  d58e136

  Copy full SHA for d58e136

• destroy tests passing

  hanalways

  committed
  942f1ad

  Copy full SHA for 942f1ad

• some styling

  hanalways

  committed
  5fa222e

  Copy full SHA for 5fa222e

• remove unncessary driver validation

  hanalways

  committed
  1fc5a3d

  Copy full SHA for 1fc5a3d

• check csv files to reseed

  hanalways

  committed
  6237bcc

  Copy full SHA for 6237bcc

• lots of styling

  hanalways

  committed
  315069c

  Copy full SHA for 315069c

Commits on Apr 20, 2019

• added test for update, passing

  MariaWissler

  committed
  55fdabc

  Copy full SHA for 55fdabc

• added update test passing

  MariaWissler

  committed
  5ba0f65

  Copy full SHA for 5ba0f65

Commits on Apr 21, 2019

• removed car-make and model from db and views, minor refactor of trips controller

  MariaWissler

  committed
  a8bfad6

  Copy full SHA for a8bfad6