Code

B/bk/master#55

Code

Open

Bella8 wants to merge 45 commits intoAda-C6:b/bk/masterAda-C6/FarMarRails:b/bk/masterfrom Bella8:b/bk/masterBella8/FarMarRails:b/bk/masterCopy head branch name to clipboard

+984-20

Commits

Commits on Oct 4, 2016

• Added markets and vendors resources/routes

  esther-ng

  committed
  fe5850e

• Generated models with relationships.

  Bella8

  committed
  fdc2e67

Commits on Oct 5, 2016

• Added erd, WIP exploring BK MVC

  esther-ng

  committed
  8f0eedc

• Added controllers and index view for main page

  Bella8

  committed
  3814e30

• Completed seeds file

  esther-ng

  committed
  39ddaa1

• added new and create in the controller and new view

  Bella8

  committed
  a7c30c9

• Completed user_show view

  esther-ng

  committed
  b2d57a8

• added creatate for market

  Bella8

  committed
  0975683

• fixed changes for merge

  Bella8

  committed
  67eb26a

Commits on Oct 6, 2016

• Added the edit and delete button in the market, still working on edit

  Bella8

  committed
  273f559

• Completed vendor homepage with product and sale info. WIP: get new product form to work.

  esther-ng

  committed
  4ed6b28

• Got new link and view working but need to finish create/build action

  esther-ng

  committed
  d2801d0

• Added vendor controller

  Bella8

  committed
  9b64a5f

• Fixed merge conflict and added market edit vendor vendor

  Bella8

  committed
  f6111a7

• Create product works, no sales doesn't break show, WIP: edit/delete product

  esther-ng

  committed
  8eb1a4d

• Made sure that only market can edit a market and deleted commets

  Bella8

  committed
  a40b11a

• Fixed conflict in vendors_controller

  esther-ng

  committed
  b280f6b

• functioning edit product link

  esther-ng

  committed
  e798546

• functioning delete product link

  esther-ng

  committed
  ed8e7ac

Commits on Oct 7, 2016

• Moved sales filter and totals from vendor controller to vendor model, added sale function

  esther-ng

  committed
  550d6b0

• Fixed vendor controller referene to sales total method.

  esther-ng

  committed
  c58563f

• fixed the create, edit, and delete function for the vendors and cleaned up the code

  Bella8

  committed
  8828e34

• fixed vendor merge conflict

  Bella8

  committed
  8526008

• fixed more merge conflict

  Bella8

  committed
  df648e7

• Used form to require purchase time input

  esther-ng

  committed
  6f2dd8b

• Made sale amount required too.

  esther-ng

  committed
  4c48e57

• Removed unnecessary routes

  esther-ng

  committed
  ea6c5d4

• Adjusted Gemfile for Heroku

  esther-ng

  committed
  2ba3b91

• Added basic css for mainpage

  esther-ng

  committed
  e978c95

• finished home page

  esther-ng

  committed
  c07861e

• Added application header

  esther-ng

  committed
  a188597

• worked in market and vendor css

  Bella8

  committed
  0f7cfdf

• Added list styling and linked application header

  esther-ng

  committed
  094d093

• Merge branch 'b/bk/market_css' into b/bk/master

  Bella8

  committed
  c327a47

• Added styling to some forms

  esther-ng

  committed
  329856b

• Changed market CSS to look like Vendor CSS

  Bella8

  committed
  34251ec

• fixed merge conflict

  Bella8

  committed
  3797549

• Changed production.rb file

  Bella8

  committed
  f2cdec4

• changed production.rb again

  Bella8

  committed
  921eac0

• changed production.rb number 3

  Bella8

  committed
  3e57db9

Commits on Oct 8, 2016

• changed the gem file

  Bella8

  committed
  a1e7e4b

• Compiled assets

  Bella8

  committed
  9a0734f

• changed image

  Bella8

  committed
  49423e6

• added css to market-vendor

  Bella8

  committed
  8bbd4fd

• fixed some css that was not showing up on heroku

  Bella8

  committed
  a71bc66