Code

Jessica & Lauren's FarMarRails Site#43

Code

Open

jchung722 wants to merge 93 commits intoAda-C6:masterAda-C6/FarMarRails:masterfrom jchung722:masterjchung722/FarMarRails:masterCopy head branch name to clipboard

+2,347-57

Commits

Commits on Oct 4, 2016

• created new rails app

  jchung722

  committed
  588527c

• re-added seed CSVs

  laurenfb

  committed
  c2c4029

• created all controllers

  jchung722

  committed
  8f2a3f6

• added models

  jchung722

  committed
  d86797e

• added homes controller

  jchung722

  committed
  3ea0161

• seed database

  laurenfb

  committed
  ace4111

• Update and rename README.rdoc to README.md

  jchung722

  authored
  5497a8c

• added photo of data structure

  laurenfb

  authored
  951cc86

• rename photo

  laurenfb

  committed
  f6e323e

• Update README.md

  jchung722

  authored
  677a1e3

• added home page & index links for Market & Vendor. woo hoo

  laurenfb

  committed
  5a25fb4

• Merge branch 'master' of https://github.com/jchung722/FarMarRails

  laurenfb

  committed
  78615c8

• index method for viewing all Markets

  laurenfb

  committed
  692010f

• show method in markets controller

  laurenfb

  committed
  d04fdff

• added link to each market in the html index page

  laurenfb

  committed
  59a9575

• show view for individual markets

  laurenfb

  committed
  8355781

• add new route aliases & fix typo in vendors/index route

  laurenfb

  committed
  e64a070

• Merge pull request #1 from jchung722/view-all-markets

  Show description for d4de686
  jchung722

  authored
  d4de686

Commits on Oct 5, 2016

• added new and update option to market

  jchung722

  committed
  2d6ef4c

• Merge pull request #2 from jchung722/forms

  Show description for d26363d
  laurenfb

  authored
  d26363d

• links to edit and add market

  jchung722

  committed
  9f6d309

• added overall user views

  jchung722

  committed
  06022fe

• added index view for vendors with links to show

  laurenfb

  committed
  7a84e0b

• added ability for vendors to add new product

  laurenfb

  committed
  a08a4fd

• ability for vendors to edit and update products

  laurenfb

  committed
  1cdfec5

• add vendor option

  jchung722

  committed
  7f48dc3

• added rendered button to update products from the vendors/index page

  laurenfb

  committed
  3f2f774

• abilty to delete products as a vendor

  laurenfb

  committed
  521cb13

• added delete button to rendered product buttons

  laurenfb

  committed
  7f8df10

• added redirect after destroy, thanks jessica

  laurenfb

  committed
  7255e8a

• show product when link is clicked

  laurenfb

  committed
  ed6db72

• add buttons for edit and delete to show product page

  laurenfb

  committed
  aca9c78

• comments

  laurenfb

  committed
  94020df

• delete and edit vendor options added

  jchung722

  committed
  ab00430

• Merge pull request #3 from jchung722/market_editing_vendor_list

  Show description for 6d3bd3c
  laurenfb

  authored
  6d3bd3c

• added sale button file

  laurenfb

  committed
  0199d4d

• resolved merge conflict in vendors controller

  laurenfb

  committed
  ee06b31

• typo fix & routes for new & create in sale

  laurenfb

  committed
  67d028a

• form and button for adding a new sale from a product

  laurenfb

  committed
  ba460ff

• vendor can see list of sales

  jchung722

  committed
  975d2b3

• added ability to create a new sale from a product

  laurenfb

  committed
  1c64c19

• Merge pull request #5 from jchung722/add-sales

  Show description for edc98ab
  laurenfb

  authored
  edc98ab

Commits on Oct 6, 2016

• total sale

  jchung722

  committed
  632adda

• changing h1s to h2s in market

  laurenfb

  committed
  667bfff

• change h1s to h2s in product views

  laurenfb

  committed
  5cc5064

• changing h1s to h2s in sale views

  laurenfb

  committed
  b7fe186

• changing h1s to h2s in vendor views

  laurenfb

  committed
  a460165

• changing h1s to h2s in homes views

  laurenfb

  committed
  aa0fdfc

• added monthly sale list and total

  jchung722

  committed
  9720ac7

• Merge pull request #6 from jchung722/monthly_sale

  Show description for 496ce2a
  laurenfb

  authored
  496ce2a

• CSS styling, a teeny bit

  laurenfb

  committed
  24cd619

• Merge pull request #7 from jchung722/styling-and-layout

  Show description for 3e54812
  jchung722

  authored
  3e54812

• move sales logic to controller

  laurenfb

  committed
  65e7c05

• aligned vendors with buttons

  jchung722

  committed
  43b22aa

• add method to convert sale input to storing in cents

  laurenfb

  committed
  711e1c9

• more css and added redirects

  jchung722

  committed
  ecae763

• added ability to see products of each market on the guest page

  laurenfb

  committed
  69c02fd

• added functional top nav links in application.html.erb layout

  laurenfb

  committed
  89d17e6

• created market shut down option

  jchung722

  committed
  9d803e4

• more application.html.erb styling and layout

  laurenfb

  committed
  275c410

• made add vendor button

  jchung722

  committed
  6e60f1d

• Merge pull request #8 from jchung722/styling-and-layout

  Show description for fc3fa36
  jchung722

  authored
  fc3fa36

• Merge pull request #9 from jchung722/market_spruce

  Show description for 6d8938f
  laurenfb

  authored
  6d8938f

• added image

  jchung722

  committed
  2d62766

• added background image

  jchung722

  committed
  366e0e1

Commits on Oct 7, 2016

• style & layout for front page

  laurenfb

  committed
  b456c2d

• market lists on index and home render with a new partial

  laurenfb

  committed
  cd3ca0d

• Merge pull request #10 from jchung722/front-page-buttons

  Show description for e4318c2
  jchung722

  authored
  e4318c2

• Merge pull request #11 from jchung722/new-partials

  Show description for 1a921df
  jchung722

  authored
  1a921df

• rolled back broken partials

  laurenfb

  committed
  2c2680d

• Merge pull request #12 from jchung722/new-partials

  Show description for 41cf060
  laurenfb

  authored
  41cf060

• updated Gemfile for production yay

  laurenfb

  committed
  13f2dcf

• changed order of seed files

  laurenfb

  committed
  e136aa8

• commented out sales

  laurenfb

  committed
  c608542

• serve static assets + uncomment sales

  laurenfb

  committed
  e44e1a8

• dumb end

  laurenfb

  committed
  9882c9e

• please work, database

  laurenfb

  committed
  7dea818

• comment out Markets comment

  laurenfb

  committed
  029c74a

• styling the top header on all pages except home

  laurenfb

  committed
  e033fe5

• spaced li lines

  jchung722

  committed
  8e783ab

• Merge pull request #13 from jchung722/final-touches-on-vendor

  Show description for eda3e6c
  jchung722

  authored
  eda3e6c

• Merge pull request #14 from jchung722/more-market-styles

  Show description for e3758ae
  laurenfb

  authored
  e3758ae

• styled vendors/show view

  laurenfb

  committed
  4d3ea66

• fixed add market button

  jchung722

  committed
  bf2ed8f

• styling new product page and form

  laurenfb

  committed
  289d5dc

• added footer

  jchung722

  committed
  454d695

• style create product page

  laurenfb

  committed
  8e3579f

• style sales index page

  laurenfb

  committed
  56aaede

• final touches everywhere

  laurenfb

  committed
  96b8c9b

• link formatting

  jchung722

  committed
  247af7c

• Merge pull request #15 from jchung722/final-touches-on-vendor

  Show description for d6c8c0e
  jchung722

  authored
  d6c8c0e

• Merge pull request #16 from jchung722/market-styles-continued

  Show description for 00cb88d
  laurenfb

  authored
  00cb88d

• a few more links

  laurenfb

  committed
  b8b0fb8