Code

Ports - Elle and Cloudy#23

Code

Open

dev-elle-up wants to merge 35 commits intoAda-C11:masterAda-C11/ride-share-rails:masterfrom dev-elle-up:masterdev-elle-up/ride-share-rails:masterCopy head branch name to clipboard

+3,047-206

Commits

Commits on Apr 16, 2019

• New commit to play with branch_a

  dev-elle-up

  committed
  2a782d7

  Copy full SHA for 2a782d7

• Made a new Rails project in the cloned folder. Created models for Driver, Passenger, Trip. Added foreign keys to Trip. Got databases working and seeded locally.

  dev-elle-up

  committed
  d14e318

  Copy full SHA for d14e318

• Added resources routes for all three models.

  dev-elle-up

  committed
  17d3fb8

  Copy full SHA for 17d3fb8

• Added a comment. Testing pushing a branch.

  dev-elle-up

  committed
  f733bd0

  Copy full SHA for f733bd0

Commits on Apr 17, 2019

• Remove spurious model tests

  dev-elle-up

  committed
  658dd0b

  Copy full SHA for 658dd0b

• Generated controllers for Drivers, Passengers and Trips.

  dev-elle-up

  committed
  00bfa63

  Copy full SHA for 00bfa63

• Created Passenger index view.

  dev-elle-up

  committed
  956ab0e

  Copy full SHA for 956ab0e

• Generated the views for all passengers and drivers.

  dev-elle-up

  committed
  34d55c2

  Copy full SHA for 34d55c2

• Added has_many and belongs_to properties to the models.

  dev-elle-up

  committed
  17120f2

  Copy full SHA for 17120f2

• changed the trip#index models from plural to singular. Fixed the has_man and belongs_to properties in the models

  CloudyLopez

  committed
  ce66d12

  Copy full SHA for ce66d12

Commits on Apr 18, 2019

• Nested routes.

  dev-elle-up

  committed
  73ea5b0

  Copy full SHA for 73ea5b0

• Added form partial, edit action, and edit passenger view.

  dev-elle-up

  committed
  e174abc

  Copy full SHA for e174abc

• Added update and create actions and their corresponding views. Made private passenger_params method. Added validation to passenger model - require name and phone num.

  dev-elle-up

  committed
  344a595

  Copy full SHA for 344a595

• Added destroy action to passengers controller.

  dev-elle-up

  committed
  7dda2cd

  Copy full SHA for 7dda2cd

Commits on Apr 19, 2019

• Added a list of all trips taken by a passenger to the passenger details view.

  dev-elle-up

  committed
  878dae4

  Copy full SHA for 878dae4

• Created actions for Driver controller. Made a view for driver details. Also fixed a tiny bug (shh) in passenger model. (Don't tell.)

  dev-elle-up

  committed
  0e3ef99

  Copy full SHA for 0e3ef99

Commits on Apr 20, 2019

• Added views for drivers form, trips show action and drivers edit action. Integrated links between pages. Started pseudo-coding a home page.

  dev-elle-up

  committed
  49955a3

  Copy full SHA for 49955a3

• Linked more pages together.

  dev-elle-up

  committed
  894ce49

  Copy full SHA for 894ce49

• Added a button to Passenger Details page to 'add a new trip for this passenger'.

  dev-elle-up

  committed
  e8b67bb

  Copy full SHA for e8b67bb

• Added a button to Driver Details page to 'add a new trip for this driver'.

  dev-elle-up

  committed
  6e255a0

  Copy full SHA for 6e255a0

• Deployed to heroku, added a readme.txt file to store the URLs for deployment.

  dev-elle-up

  committed
  fc5fa95

  Copy full SHA for fc5fa95

• styling on drivers new and normalize.css has been set up.

  CloudyLopez

  committed
  702167c

  Copy full SHA for 702167c

• Merge branch 'master' into styling

  CloudyLopez

  committed
  a2295aa

  Copy full SHA for a2295aa

• Added methods to driver and passenger models to calculate totals spent, earned, and avg rating.

  dev-elle-up

  committed
  9d9fdc4

  Copy full SHA for 9d9fdc4

Commits on Apr 21, 2019

• styling changes made but not completed yet

  CloudyLopez

  committed
  29c3346

  Copy full SHA for 29c3346

• commented out some code.

  CloudyLopez

  committed
  6e76fec

  Copy full SHA for 6e76fec

• Merge branch 'cloudy' of https://github.com/Mello-Cello/ride-share-rails

  Show description for 32c0e51
  dev-elle-up

  committed
  32c0e51

  Copy full SHA for 32c0e51

• did more styling, not completed. added boxes for names and stuff.

  CloudyLopez

  committed
  902b838

  Copy full SHA for 902b838

• Oops! Did a git pull while on the Elle branch. So this commit is to resolve a merge conflict with Cloudy's styling branch. This brings the elle branch up to date with the cloudy branch. Next task w…

  Show description for 276d3ca
  dev-elle-up

  committed
  276d3ca

  Copy full SHA for 276d3ca

• Merge branch 'elle'

  Show description for ddc99d9
  dev-elle-up

  committed
  ddc99d9

  Copy full SHA for ddc99d9

• Set the home page to trips#index.

  dev-elle-up

  committed
  a103b5c

  Copy full SHA for a103b5c

Commits on Apr 24, 2019

• Configured and fixed (almost) all tests for Driver controller.

  dev-elle-up

  committed
  763835f

  Copy full SHA for 763835f

Commits on Apr 25, 2019

• Wrote tests for Passenger controller.

  dev-elle-up

  committed
  4a40335

  Copy full SHA for 4a40335

• Wrote tests for Trips controller. Adjusted other tests as needed.

  dev-elle-up

  committed
  3c42977

  Copy full SHA for 3c42977

• Merge branch 'elle'

  Show description for 14a3a52
  dev-elle-up

  committed
  14a3a52

  Copy full SHA for 14a3a52