Code

Water - Kareha & Hanh#17

Code

Open

agesak wants to merge 63 commits intoAda-C14:masterAda-C14/ride-share-rails:masterfrom agesak:masteragesak/ride-share-rails:masterCopy head branch name to clipboard

+3,096-116

Commits

Commits on Nov 3, 2020

• Running new rails

  seattlefurby17

  committed
  d1e948d

  Copy full SHA for d1e948d

• rails new

  agesak

  committed
  67fb31c

  Copy full SHA for 67fb31c

• keep hanhs changes

  agesak

  committed
  1c9589d

  Copy full SHA for 1c9589d

• fix merge conflict in gemfile

  agesak

  committed
  47e779d

  Copy full SHA for 47e779d

• Controllers and Models created

  seattlefurby17

  committed
  824f53e

  Copy full SHA for 824f53e

Commits on Nov 4, 2020

• Update driver routes with index and show, created driver index

  seattlefurby17

  committed
  52c1fc1

  Copy full SHA for 52c1fc1

• Updated driver methods in driver_controller

  seattlefurby17

  committed
  ddb2a5b

  Copy full SHA for ddb2a5b

• deleting gemfile and yarn

  agesak

  committed
  afa8511

  Copy full SHA for afa8511

• add yarn and gemfile to gitignore

  agesak

  committed
  1a5c5c7

  Copy full SHA for 1a5c5c7

Commits on Nov 5, 2020

• setting up relationships, migrations to allow for seeding the data

  agesak

  committed
  06c0549

  Copy full SHA for 06c0549

• fix typo in driver controller

  agesak

  committed
  fa5d0a2

  Copy full SHA for fa5d0a2

• starting driver tests, adding driver views

  agesak

  committed
  a54b08b

  Copy full SHA for a54b08b

• Created homepage and route for homepage

  seattlefurby17

  committed
  81ce925

  Copy full SHA for 81ce925

• Testing drivers_controllers

  seattlefurby17

  committed
  17a2f0a

  Copy full SHA for 17a2f0a

• Added total_revenue to driver model

  seattlefurby17

  committed
  9639f1d

  Copy full SHA for 9639f1d

• debug total_revenue

  agesak

  committed
  0a1df26

  Copy full SHA for 0a1df26

• total revenue tests passing

  agesak

  committed
  afa321b

  Copy full SHA for afa321b

• failing total revenue tests

  agesak

  committed
  6e0ea6f

  Copy full SHA for 6e0ea6f

• Updated testing for drivers_controller

  seattlefurby17

  committed
  a334b75

  Copy full SHA for a334b75

Commits on Nov 6, 2020

• Passenger controller methods

  seattlefurby17

  committed
  efc5b0f

  Copy full SHA for efc5b0f

• Passenger_controller_tests

  seattlefurby17

  committed
  7ad70cf

  Copy full SHA for 7ad70cf

• updated passengers testing

  seattlefurby17

  committed
  a0b159c

  Copy full SHA for a0b159c

• Passenger test

  seattlefurby17

  committed
  3f2368f

  Copy full SHA for 3f2368f

• passenger model tests passing

  agesak

  committed
  600669d

  Copy full SHA for 600669d

• total earnings test still failing

  agesak

  committed
  b121275

  Copy full SHA for b121275

• example code from becca

  agesak

  committed
  fac6ba0

  Copy full SHA for fac6ba0

• Updated trip class

  seattlefurby17

  committed
  db64962

  Copy full SHA for db64962

• a hopeless trips#show method

  agesak

  committed
  e827fab

  Copy full SHA for e827fab

• routes update

  seattlefurby17

  committed
  c2b4a10

  Copy full SHA for c2b4a10

• merge changes in routes

  seattlefurby17

  committed
  bc3abdb

  Copy full SHA for bc3abdb

• Trips method, show page

  seattlefurby17

  committed
  78a9e99

  Copy full SHA for 78a9e99

• looks the same

  agesak

  committed
  f361707

  Copy full SHA for f361707

• Merge branch 'master' of https://github.com/agesak/ride-share-rails

  agesak

  committed
  9107215

  Copy full SHA for 9107215

• Updating driver edit and update

  seattlefurby17

  committed
  56fcf21

  Copy full SHA for 56fcf21

• Merge branch 'master' of https://github.com/agesak/ride-share-rails

  agesak

  committed
  6a99bc7

  Copy full SHA for 6a99bc7

• rename trips edit view file

  agesak

  committed
  1de7767

  Copy full SHA for 1de7767

• trip controller tests and passenger model tests in progress

  agesak

  committed
  0f467dc

  Copy full SHA for 0f467dc

• adding new to controller

  agesak

  committed
  925686a

  Copy full SHA for 925686a

• working on tests

  agesak

  committed
  41b7600

  Copy full SHA for 41b7600

• show errors if invalid passenger

  agesak

  committed
  d2d26cf

  Copy full SHA for d2d26cf

• show errors if invalid driver

  agesak

  committed
  63a01ac

  Copy full SHA for 63a01ac

• driver/trips errors raised in view

  agesak

  committed
  3a80694

  Copy full SHA for 3a80694

• tests for driver change status

  agesak

  committed
  d9d443d

  Copy full SHA for d9d443d

Commits on Nov 7, 2020

• remove unnecessary/wrong controller test in passenger model tests

  agesak

  committed
  2957df1

  Copy full SHA for 2957df1

• change driver status if assignned to trip

  agesak

  committed
  71460cf

  Copy full SHA for 71460cf

• Trip controller update

  seattlefurby17

  committed
  80168da

  Copy full SHA for 80168da

• Resolve merge

  seattlefurby17

  committed
  c83c564

  Copy full SHA for c83c564

• adding some model tests for trip

  agesak

  committed
  73a7380

  Copy full SHA for 73a7380

• driver tests

  agesak

  committed
  5b51752

  Copy full SHA for 5b51752

• Trip controller tests done

  seattlefurby17

  committed
  f4b2371

  Copy full SHA for f4b2371

• updated trip controller test

  seattlefurby17

  committed
  7a3a459

  Copy full SHA for 7a3a459

• fix failing passenger net expenditures

  agesak

  committed
  28224d1

  Copy full SHA for 28224d1

• Merge branch 'master' of https://github.com/agesak/ride-share-rails

  agesak

  committed
  70e3552

  Copy full SHA for 70e3552

Commits on Nov 9, 2020

• Remove status column from drivers

  seattlefurby17

  committed
  765f384

  Copy full SHA for 765f384

• Update tests

  seattlefurby17

  committed
  7d619b8

  Copy full SHA for 7d619b8

• Updated tests

  seattlefurby17

  committed
  52bf781

  Copy full SHA for 52bf781

• updated controller-trip-tests

  seattlefurby17

  committed
  5e5c2f5

  Copy full SHA for 5e5c2f5

• updated controller-trip-tests

  seattlefurby17

  committed
  8322c34

  Copy full SHA for 8322c34

• updated controller-trip-tests

  seattlefurby17

  committed
  3614d43

  Copy full SHA for 3614d43

• Cleaned up and removed comments

  seattlefurby17

  committed
  0b9bf40

  Copy full SHA for 0b9bf40

Commits on Nov 18, 2020

• Ignore .env file

  seattlefurby17

  committed
  186c6ae

  Copy full SHA for 186c6ae

Commits on Nov 19, 2020

• merge into master

  seattlefurby17

  committed
  abc6acb

  Copy full SHA for abc6acb

• Revert "merge into master"

  Show description for 3fc7892
  seattlefurby17

  committed
  3fc7892

  Copy full SHA for 3fc7892