Code

Nina and Sassa PR#41

Code

Open

ninamutty wants to merge 170 commits intoAda-C6:masterAda-C6/FarMarRails:masterfrom RedSquirrelious:masterRedSquirrelious/FarMarRails:masterCopy head branch name to clipboard

+10,001-4,208

Commits

Commits on Oct 4, 2016

• first commit

  RedSquirrelious

  committed
  8687896

  Copy full SHA for 8687896

• added gems 'awesome_print' for readability and 'better_errors' and 'binding_of_caller' for easier debugging

  RedSquirrelious

  committed
  24d1deb

  Copy full SHA for 24d1deb

• added gems 'meta_request', 'pry-rails', and 'quiet_assets'

  RedSquirrelious

  committed
  6d8de9f

  Copy full SHA for 6d8de9f

• added gems 'meta_request', 'pry-rails', and 'quiet_assets'

  RedSquirrelious

  committed
  60231ac

  Copy full SHA for 60231ac

• added two columns of markets, 1st from vendors sorted by name, 2nd from vendors sorted by no. employees

  RedSquirrelious

  committed
  9e2e5ac

  Copy full SHA for 9e2e5ac

• created developement branch

  ninamutty

  committed
  4d09da8

  Copy full SHA for 4d09da8

• created vendor, market, and market_vendors models

  ninamutty

  committed
  22f512b

  Copy full SHA for 22f512b

• edited typo

  ninamutty

  committed
  eb0b5ae

  Copy full SHA for eb0b5ae

• added headings id name address city county state zip

  RedSquirrelious

  committed
  1925ca3

  Copy full SHA for 1925ca3

• added headings id name vendor_id

  RedSquirrelious

  committed
  1e6a459

  Copy full SHA for 1e6a459

• added headings id amount purchase_time vendor_id product_id

  RedSquirrelious

  committed
  2e6252d

  Copy full SHA for 2e6252d

• removed all market id information because going with join table market_vendors

  RedSquirrelious

  committed
  b605fc4

  Copy full SHA for b605fc4

• created join table for markets and vendors, added vendor_id 3x, added market_id 1x in order, 1x from vendors sorted by name, 1x by vendors sorted by num employees

  RedSquirrelious

  committed
  433a934

  Copy full SHA for 433a934

• changed relationships to join table

  ninamutty

  committed
  77a8eda

  Copy full SHA for 77a8eda

• cleaned market_vendor data, all unique relationships

  RedSquirrelious

  committed
  85bd16f

  Copy full SHA for 85bd16f

• migrated

  ninamutty

  committed
  a0e42ff

  Copy full SHA for a0e42ff

• Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails into development

  ninamutty

  committed
  b6e4971

  Copy full SHA for b6e4971

• seeded files and edited changes in text file that excel made

  ninamutty

  committed
  8080ae1

  Copy full SHA for 8080ae1

• used console

  ninamutty

  committed
  d397481

  Copy full SHA for d397481

• added Gemfile.lock

  ninamutty

  committed
  36fcb8c

  Copy full SHA for 36fcb8c

• add log/development

  ninamutty

  committed
  30217e8

  Copy full SHA for 30217e8

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

  ninamutty

  committed
  9bc3d67

  Copy full SHA for 9bc3d67

• Merge branch 'development'

  ninamutty

  committed
  60b4d28

  Copy full SHA for 60b4d28

• test

  RedSquirrelious

  committed
  19dac99

  Copy full SHA for 19dac99

• Merge pull request #1 from RedSquirrelious/sk_development

  Show description for bfa281d
  ninamutty

  authored
  bfa281d

  Copy full SHA for bfa281d

• Update README.md

  ninamutty

  authored
  7e5d46a

  Copy full SHA for 7e5d46a

• Merge pull request #2 from RedSquirrelious/sk_development

  Show description for b38559b
  RedSquirrelious

  authored
  b38559b

  Copy full SHA for b38559b

Commits on Oct 5, 2016

• changed market_vendors model to market_vendors_clean

  ninamutty

  committed
  9745582

  Copy full SHA for 9745582

• added product and sale models, added seed data

  RedSquirrelious

  committed
  2da978f

  Copy full SHA for 2da978f

• Merge pull request #3 from RedSquirrelious/sk_development

  Show description for fe06481
  RedSquirrelious

  authored
  fe06481

  Copy full SHA for fe06481

• edit market and vendor relationships - now they can interact properly

  ninamutty

  committed
  eb39812

  Copy full SHA for eb39812

• Merge branch 'development'

  ninamutty

  committed
  f06825d

  Copy full SHA for f06825d

• Doubling down on the new schema

  ninamutty

  committed
  9d86e12

  Copy full SHA for 9d86e12

• edited schema - merge

  ninamutty

  committed
  27d7a89

  Copy full SHA for 27d7a89

• created markets controller (with functionality to edit, delete, and create vendors'

  ninamutty

  committed
  6000b0c

  Copy full SHA for 6000b0c

• created vendor controller

  RedSquirrelious

  committed
  28b04d3

  Copy full SHA for 28b04d3

• added index and show_vendor methods

  RedSquirrelious

  committed
  31429a2

  Copy full SHA for 31429a2

• added product methods (new, create, find_product, show_product, show_all_products, update_product, edit_product, destroy_product) and sale methods (new_sale, create_sale, show_sale, show_all_sales)

  RedSquirrelious

  committed
  8322a55

  Copy full SHA for 8322a55

• working on markets#index and markets#show'

  ninamutty

  committed
  7a3534e

  Copy full SHA for 7a3534e

• updated log

  ninamutty

  committed
  25f163c

  Copy full SHA for 25f163c

• re-added product and sale models

  RedSquirrelious

  committed
  4ddccb3

  Copy full SHA for 4ddccb3

• first run routes for vendors sales products

  RedSquirrelious

  committed
  9d9f29d

  Copy full SHA for 9d9f29d

• created market index and show pages - information and links

  ninamutty

  committed
  0aab108

  Copy full SHA for 0aab108

• renamed method, delete --> destroy

  RedSquirrelious

  committed
  b23e8e2

  Copy full SHA for b23e8e2

• added has_many relationship to sales

  RedSquirrelious

  committed
  0235bbd

  Copy full SHA for 0235bbd

• added vendor routes

  RedSquirrelious

  committed
  092ae0a

  Copy full SHA for 092ae0a

• added vendors index view

  RedSquirrelious

  committed
  d8db633

  Copy full SHA for d8db633

• added root_to view, added show_vendor path

  RedSquirrelious

  committed
  c3b75a6

  Copy full SHA for c3b75a6

• added edit, delete, and create new markets functionality

  ninamutty

  committed
  5dd4923

  Copy full SHA for 5dd4923

• added find_vendor method, changed show_vendor method

  RedSquirrelious

  committed
  b6bd003

  Copy full SHA for b6bd003

• added name, which works, attempting to show all products a vendor sells

  RedSquirrelious

  committed
  d0ee44f

  Copy full SHA for d0ee44f

• added id to show vendor routes

  RedSquirrelious

  committed
  dee22f9

  Copy full SHA for dee22f9

• added relationships to sales and products

  RedSquirrelious

  committed
  4c8cf84

  Copy full SHA for 4c8cf84

• added relationship to vendors

  RedSquirrelious

  committed
  76a2bb5

  Copy full SHA for 76a2bb5

• adjusted relationship to products added relationship to vendors

  RedSquirrelious

  committed
  e568f72

  Copy full SHA for e568f72

• attempting to show all products

  RedSquirrelious

  committed
  de949a2

  Copy full SHA for de949a2

• changes from something

  RedSquirrelious

  committed
  de7f947

  Copy full SHA for de7f947

• removed development, tmp, and log files

  ninamutty

  committed
  00e61dc

  Copy full SHA for 00e61dc

• updated .gitignore

  ninamutty

  committed
  6de0e17

  Copy full SHA for 6de0e17

• merged remote master

  ninamutty

  committed
  8536f0b

  Copy full SHA for 8536f0b

• merged master with market_controller branch

  ninamutty

  committed
  f5de0bd

  Copy full SHA for f5de0bd

• updated market routes so they don't conflict with vendor routes

  ninamutty

  committed
  e184e68

  Copy full SHA for e184e68

• working on connecting products to vendor view

  RedSquirrelious

  committed
  528b394

  Copy full SHA for 528b394

• changed relationship, belongs_to vendors --> belongs_to vendor

  RedSquirrelious

  committed
  d7ca414

  Copy full SHA for d7ca414

• log

  RedSquirrelious

  committed
  fdcd607

  Copy full SHA for fdcd607

• filled in blanks

  RedSquirrelious

  committed
  5cb06d5

  Copy full SHA for 5cb06d5

• added vendor view through market

  ninamutty

  committed
  bb9e839

  Copy full SHA for bb9e839

• Merge branch 'show_vendor_view'

  RedSquirrelious

  committed
  a7e56e8

  Copy full SHA for a7e56e8

• Nina's work

  Show description for 2695eba
  RedSquirrelious

  committed
  2695eba

  Copy full SHA for 2695eba

Commits on Oct 6, 2016

• added db modified files

  ninamutty

  committed
  2dd86f8

  Copy full SHA for 2dd86f8

• able to add a vendor to a specific market instance

  ninamutty

  committed
  af14d19

  Copy full SHA for af14d19

• merge

  ninamutty

  committed
  e8192c5

  Copy full SHA for e8192c5

• app/controllers/markets_controller.rb

  ninamutty

  committed
  a3b9a12

  Copy full SHA for a3b9a12

• added tmp

  ninamutty

  committed
  819b7ff

  Copy full SHA for 819b7ff

• migrations

  ninamutty

  committed
  b276333

  Copy full SHA for b276333

• Merge branch 'master' into market_controller

  ninamutty

  committed
  70bc7c7

  Copy full SHA for 70bc7c7

• market can edit a vendor

  ninamutty

  committed
  9968561

  Copy full SHA for 9968561

• product form

  RedSquirrelious

  committed
  d66c01d

  Copy full SHA for d66c01d

• added sale form

  RedSquirrelious

  committed
  b234857

  Copy full SHA for b234857

• added vendor header form

  RedSquirrelious

  committed
  5170a79

  Copy full SHA for 5170a79

• added show all products to vendor view, changed find product method, changed show all products method, changed update product method so it doesn't incorrectly change db

  RedSquirrelious

  committed
  606cb8c

  Copy full SHA for 606cb8c

• added partial, added buttons to create sale, edit product, delete, not all working yet

  RedSquirrelious

  committed
  780d11d

  Copy full SHA for 780d11d

• added partial for header

  RedSquirrelious

  committed
  f18f080

  Copy full SHA for f18f080

• removed buttons for edit and delete to test routing, link to product works

  RedSquirrelious

  committed
  5cdb864

  Copy full SHA for 5cdb864

• added partial for header and form, added name

  RedSquirrelious

  committed
  4b3c930

  Copy full SHA for 4b3c930

• fixed vendor-related routing overall

  RedSquirrelious

  committed
  5280754

  Copy full SHA for 5280754

• added various things

  Show description for 79e4570
  RedSquirrelious

  committed
  79e4570

  Copy full SHA for 79e4570

• de/development

  ninamutty

  committed
  59797f9

  Copy full SHA for 59797f9

• cleaned seed_csvs for UTF-8 error

  ninamutty

  committed
  e53c1fb

  Copy full SHA for e53c1fb

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

  ninamutty

  committed
  e328d82

  Copy full SHA for e328d82

• update path correct

  RedSquirrelious

  committed
  5f7a306

  Copy full SHA for 5f7a306

• added a line break"

  ninamutty

  committed
  65c54f0

  Copy full SHA for 65c54f0

• added product name to form, made @post_path generic

  RedSquirrelious

  committed
  6d50a3b

  Copy full SHA for 6d50a3b

• added partial form

  RedSquirrelious

  committed
  96f062e

  Copy full SHA for 96f062e

• fixed edit product button

  RedSquirrelious

  committed
  fb1f9e0

  Copy full SHA for fb1f9e0

• deleted commented out code and test code

  RedSquirrelious

  committed
  e646ec6

  Copy full SHA for e646ec6

• deleted vendor header partial b/c already in product form partial

  RedSquirrelious

  committed
  94fb176

  Copy full SHA for 94fb176

• changed update product html verb

  RedSquirrelious

  committed
  ed924a2

  Copy full SHA for ed924a2

• removed bad excel formatting

  RedSquirrelious

  committed
  d5d6a17

  Copy full SHA for d5d6a17

• merging in views

  Show description for feee98a
  RedSquirrelious

  committed
  feee98a

  Copy full SHA for feee98a

• baseline market controller functionality complete

  ninamutty

  committed
  fa11c3a

  Copy full SHA for fa11c3a

• merged market controller branch

  ninamutty

  committed
  f2433b6

  Copy full SHA for f2433b6

• added working add new product method

  RedSquirrelious

  committed
  6cbe3b0

  Copy full SHA for 6cbe3b0

• added product form partial

  RedSquirrelious

  committed
  c5f80bf

  Copy full SHA for c5f80bf

• added working add new product button

  RedSquirrelious

  committed
  5c17324

  Copy full SHA for 5c17324

• connected new product route and create product routes to vendor id

  RedSquirrelious

  committed
  19abd4d

  Copy full SHA for 19abd4d

• added first new product from vendor page

  RedSquirrelious

  committed
  fb7f56a

  Copy full SHA for fb7f56a

• added delete confirmation messages to market views

  ninamutty

  committed
  c269eb8

  Copy full SHA for c269eb8

• added landing index route, root to landing index

  RedSquirrelious

  committed
  b3507f1

  Copy full SHA for b3507f1

• vendor can delete a product

  ninamutty

  committed
  f645b6e

  Copy full SHA for f645b6e

• added landing controller for landing page

  RedSquirrelious

  committed
  8db5b95

  Copy full SHA for 8db5b95

• added landing view as root view that links to vendor index and market index

  RedSquirrelious

  committed
  be6e900

  Copy full SHA for be6e900

• added show item type method

  RedSquirrelious

  committed
  47728bb

  Copy full SHA for 47728bb

• removed duplicate root route

  RedSquirrelious

  committed
  18c72b7

  Copy full SHA for 18c72b7

• fixed duplicate root route

  RedSquirrelious

  committed
  a97a0e9

  Copy full SHA for a97a0e9

• added product_search controller

  RedSquirrelious

  committed
  4fc7c3c

  Copy full SHA for 4fc7c3c

• added market information for vendor user

  ninamutty

  committed
  87fb6ac

  Copy full SHA for 87fb6ac

• vendors can create a new sale

  ninamutty

  committed
  ba1e82e

  Copy full SHA for ba1e82e

• re-copied sales file - excel changed datatimes

  ninamutty

  committed
  017d029

  Copy full SHA for 017d029

• db development

  ninamutty

  committed
  e091216

  Copy full SHA for e091216

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

  ninamutty

  committed
  9c8c859

  Copy full SHA for 9c8c859

• Merge branch 'finish_vendor'

  ninamutty

  committed
  d08fb6c

  Copy full SHA for d08fb6c

• added define type and veggie_search methods

  RedSquirrelious

  committed
  d2cf392

  Copy full SHA for d2cf392

• added product_search button

  RedSquirrelious

  committed
  d0494b7

  Copy full SHA for d0494b7

• added view of veggie_search list of markets

  RedSquirrelious

  committed
  f0a7a46

  Copy full SHA for f0a7a46

• added product_search routing

  RedSquirrelious

  committed
  b3cd853

  Copy full SHA for b3cd853

• added product search functionality

  Show description for b2a1599
  RedSquirrelious

  committed
  b2a1599

  Copy full SHA for b2a1599

• added header and footer info to application view

  ninamutty

  committed
  6a86128

  Copy full SHA for 6a86128

• added seafood_search method

  RedSquirrelious

  committed
  4125ac8

  Copy full SHA for 4125ac8

• added buttons to veggie_search view and seafood_search view

  RedSquirrelious

  committed
  4b89440

  Copy full SHA for 4b89440

• added routes to seafood_search, meat_search, baked_goods_search views

  RedSquirrelious

  committed
  13b1a6a

  Copy full SHA for 13b1a6a

• added partial product_search form

  RedSquirrelious

  committed
  41e0398

  Copy full SHA for 41e0398

• added baked_goods and meat_search views

  RedSquirrelious

  committed
  b0dda7a

  Copy full SHA for b0dda7a

• added seafood_search view

  RedSquirrelious

  committed
  129a63a

  Copy full SHA for 129a63a

• added veggie_search view

  RedSquirrelious

  committed
  d6a3d84

  Copy full SHA for d6a3d84

• added carbs_search method

  RedSquirrelious

  committed
  9fbb730

  Copy full SHA for 9fbb730

• changed baked goods to carbs_search view

  RedSquirrelious

  committed
  877d3ff

  Copy full SHA for 877d3ff

• added meat_search view

  RedSquirrelious

  committed
  29b4108

  Copy full SHA for 29b4108

• added carbs_search view

  RedSquirrelious

  committed
  0b3d405

  Copy full SHA for 0b3d405

• added link to carbs_search view

  RedSquirrelious

  committed
  f42139a

  Copy full SHA for f42139a

• added fruit search method

  RedSquirrelious

  committed
  30a722a

  Copy full SHA for 30a722a

• added fruit search view"

  RedSquirrelious

  committed
  41451fc

  Copy full SHA for 41451fc

• added link to fruit search view

  RedSquirrelious

  committed
  689fea8

  Copy full SHA for 689fea8

• added route to fruit_search view

  RedSquirrelious

  committed
  bc22226

  Copy full SHA for bc22226

Commits on Oct 7, 2016

• added sweets_search method, tweaked variables in other search methods

  RedSquirrelious

  committed
  4417053

  Copy full SHA for 4417053

• added sweets_search view

  RedSquirrelious

  committed
  ab3dc51

  Copy full SHA for ab3dc51

• added link to sweets_search

  RedSquirrelious

  committed
  1add397

  Copy full SHA for 1add397

• added sweets_search route

  RedSquirrelious

  committed
  a91a292

  Copy full SHA for a91a292

• header and footer styling done

  ninamutty

  committed
  b34bec2

  Copy full SHA for b34bec2

• added photos to assets

  ninamutty

  committed
  5916d01

  Copy full SHA for 5916d01

• working on photos

  ninamutty

  committed
  153fad7

  Copy full SHA for 153fad7

• scrolling lists added

  ninamutty

  committed
  86008ff

  Copy full SHA for 86008ff

• fixed merge conflict in routes

  ninamutty

  committed
  3cf1861

  Copy full SHA for 3cf1861

• landing/index merge updated

  ninamutty

  committed
  7776d6a

  Copy full SHA for 7776d6a

• Updated Gemfile for Heroku

  ninamutty

  committed
  1feee07

  Copy full SHA for 1feee07

• had too many sales and products

  ninamutty

  committed
  6927a26

  Copy full SHA for 6927a26

• added foreign key specification to market_vendor_cleans

  ninamutty

  committed
  5aa6401

  Copy full SHA for 5aa6401

• added headers to seed file

  ninamutty

  committed
  2427740

  Copy full SHA for 2427740

• made references singular

  ninamutty

  committed
  2935537

  Copy full SHA for 2935537

• delete rename file

  ninamutty

  committed
  875af45

  Copy full SHA for 875af45

• comment out validations

  ninamutty

  committed
  272b25d

  Copy full SHA for 272b25d

• made join has_many plural

  ninamutty

  committed
  1780c22

  Copy full SHA for 1780c22

• took our space from join table vendor_id header

  ninamutty

  committed
  f7320a0

  Copy full SHA for f7320a0

• styling for market and vendor branches complete

  ninamutty

  committed
  f19e225

  Copy full SHA for f19e225

• adding change to vendors controller

  ninamutty

  committed
  aaeae5e

  Copy full SHA for aaeae5e

• finshed landing page

  ninamutty

  committed
  1bce51c

  Copy full SHA for 1bce51c

• added jpg tags

  ninamutty

  committed
  30a5fac

  Copy full SHA for 30a5fac

• took away some borders

  ninamutty

  committed
  744257b

  Copy full SHA for 744257b

Commits on Oct 26, 2016

• commented out product search link while not 100% funcational to push to heroku

  ninamutty

  committed
  2628326

  Copy full SHA for 2628326

• adjusted landing positioning a little

  ninamutty

  committed
  24daf6c

  Copy full SHA for 24daf6c