Code

FarMar Rails#16

Code

Open

dezshino wants to merge 78 commits intoAda-C4:hrwdfcp/masterAda-C4/FarMarRails:hrwdfcp/masterfrom dezshino:hrwdfcp/masterdezshino/FarMarRails:hrwdfcp/masterCopy head branch name to clipboard

+653-20,176

Commits

Commits on Nov 18, 2015

• Add models for market and vendor

  dezshino

  committed
  f626e27

• Fix models, create schema

  dezshino

  committed
  0a9b8b3

• delete unneccessary csv files

  yourFriendWes

  committed
  6f5be76

• generate models for product and sales

  yourFriendWes

  committed
  f7e9314

• add active record relationships

  yourFriendWes

  committed
  4bda5b2

• seed csv data

  yourFriendWes

  committed
  1478e50

• Add routes for markets and vendors

  dezshino

  committed
  509cf9a

• Update gemfiles with better_errors

  dezshino

  committed
  094811c

• Change root route, update views for home and markets index

  dezshino

  committed
  ef633e4

• Add methods to markets and vendors controllers

  dezshino

  committed
  91d6f89

• Add view pages for show,new, and edit for markets and vendors

  dezshino

  committed
  d85131a

• Add link from markets index to market show page, display market info on show page

  dezshino

  committed
  9235a2b

• Differentiate views for general user and market-user

  dezshino

  committed
  0a97811

• Link to vendor show page from vendors index page,create a vendor show view

  dezshino

  committed
  ee6931f

• differentiate show view for user and market

  yourFriendWes

  committed
  f56d86d

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  bbd21b8

• Add vendor products and sales info to Vendor Show page

  dezshino

  committed
  3f871a7

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  Show description for 2127ae5
  yourFriendWes

  committed
  2127ae5

• Merge pull request #1 from desireepoland/hailey

  Show description for 5d76026
  dezshino

  committed
  5d76026

• Set up view for Vendor show page

  dezshino

  committed
  9918ef3

Commits on Nov 19, 2015

• Refactor adding vendor sales

  dezshino

  committed
  1f0103f

• differentiate user show and market show

  yourFriendWes

  committed
  99fd97a

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  aed7cc0

• Create controllers for products and sales, nest products and sales routes inside vendors routes

  dezshino

  committed
  88bbc0a

• Update routes to have sales nested inside products, add actions to sales and products controllers

  dezshino

  committed
  3fc8ed5

• add form to create new market

  yourFriendWes

  committed
  a590bbc

• add form to edit market

  yourFriendWes

  committed
  b321b20

• Change Vendor product info into a table instead of list

  dezshino

  committed
  0a04e66

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  c7e8403

• Change vendor sales into table

  dezshino

  committed
  19ee041

• add link on show page to update market

  yourFriendWes

  committed
  375cc78

• Add files for views for products and sales

  dezshino

  committed
  7358d1f

• Add form to create a new product, link to form from vendor show page

  dezshino

  committed
  7f3982d

• add create and update vendor functions

  yourFriendWes

  committed
  33376aa

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  00cd0bd

• Fix form to create a new product for a specific vendor to save

  dezshino

  committed
  3596906

• fix delete vendor link in markets/show

  yourFriendWes

  committed
  f8c4ab9

• add new and create methods for sale

  yourFriendWes

  committed
  ecc6f85

• Link to edit product page from vendor show page

  dezshino

  committed
  4cff0c9

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  dezshino

  committed
  0f8b93d

• Make the products update action work

  dezshino

  committed
  6d1ef13

• Add ability to delete a vendor's product

  dezshino

  committed
  d61c014

• add method to add new product sale

  yourFriendWes

  committed
  a25e75f

• Change edit and delete link names to be symbols

  dezshino

  committed
  69d9be7

• add method to add new product sale

  yourFriendWes

  committed
  14f4330

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  b8ec16c

• add a new sale for product works

  yourFriendWes

  committed
  118a3be

Commits on Nov 20, 2015

• Format vendor show page to look nicer

  dezshino

  committed
  7946c74

• Add Old Standard TT font to site

  dezshino

  committed
  e7296e4

• Update style

  dezshino

  committed
  568d43f

• nested vendor in market

  yourFriendWes

  committed
  086d9ad

• add background image and font color

  dezshino

  committed
  02541a4

• Add style to home page

  dezshino

  committed
  2b46d78

• Add styling

  dezshino

  committed
  dfad819

• Chnage market show vendors list into a table, change edit and delete to be icons

  dezshino

  committed
  98429b2

• change monthly sales methods to vendor instance methods

  yourFriendWes

  committed
  f6fd737

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  20195e1

• format display of monthly sales methods on vendor show view

  yourFriendWes

  committed
  5a1a334

• Fix background image to not repeat

  dezshino

  committed
  8bfc9ec

• change monthly and total sales to display as currency

  yourFriendWes

  committed
  f7fa6b0

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  10ab87e

• Add a header of navigation links, re-style home page

  dezshino

  committed
  e739729

• add names to displays of product sales

  yourFriendWes

  committed
  498251a

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  826e2b1

• Re add the csrf_meta_tag

  dezshino

  committed
  2584e62

• Take out extra space

  dezshino

  committed
  2642e2f

• add styling to links

  yourFriendWes

  committed
  b9e6a29

• update gemfiles

  dezshino

  committed
  f1905c2

• Update stuff for heroku

  dezshino

  committed
  c555f53

• Format background image to work with heroku

  dezshino

  committed
  bc5b4c4

• add rails_12factor gem to gemfile

  dezshino

  committed
  93a2100

• fix seeds for heroku

  dezshino

  committed
  f2adfc2

• add apple emoji to cursor

  yourFriendWes

  committed
  e936403

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  3be9d74

• update cursor image for heroku

  dezshino

  committed
  6f88fb8

• remove 'market id' field from create vendor form

  yourFriendWes

  committed
  3f0b45e

• Merge branch 'hrwdfcp/master' of github.com:desireepoland/FarMarRails into hrwdfcp/master

  yourFriendWes

  committed
  6352f8d

Commits on Nov 21, 2015

• fix market show to have correct vendor paths

  yourFriendWes

  committed
  382c6e9