Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nicole and Yeni FarMar Episode II: Return of the Git Clones #38

Open
wants to merge 48 commits into
base: b/nmu+ycd/master
Choose a base branch
from
Open

Nicole and Yeni FarMar Episode II: Return of the Git Clones #38

wants to merge 48 commits into from

Commits on Oct 4, 2016

  1. Created models and relationships between models. Have not migrated.

    @nurlywhirly
    nurlywhirly committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    6d9c128 View commit details
    Browse the repository at this point in the history

  2. Migrated tables.

    @nurlywhirly
    nurlywhirly committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    4c254b8 View commit details
    Browse the repository at this point in the history

  3. Route setup, try Ada-C6#1.

    @nurlywhirly
    nurlywhirly committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    c6f7192 View commit details
    Browse the repository at this point in the history

  4. Created empty controllers for market, vendor, product, sale

    @nurlywhirly
    nurlywhirly committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    2561eae View commit details
    Browse the repository at this point in the history

  5. Added empty methods to market, product, vendor, sale controllers.

    @yenicapotediaz
    yenicapotediaz committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    dbaf9a7 View commit details
    Browse the repository at this point in the history

  6. Set up and migrated seed data, added headers to .csvs, forced primary… 

    … keys from .csv
    @nurlywhirly
    nurlywhirly committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    8247ea5 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2016

  1. Added rails-erd gem and generated a diagram

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    2e6f74b View commit details
    Browse the repository at this point in the history

  2. Rough outputted list of all markets completed on market/index.html.erb

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    7346af6 View commit details
    Browse the repository at this point in the history

  3. Market index page laid out in a table with actions on individual markets

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    83f011b View commit details
    Browse the repository at this point in the history

  4. Created market_form partial and added it to market/new and market/edit

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    eb09351 View commit details
    Browse the repository at this point in the history

  5. Built skeleton of market/show page with full functionality

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    07ddfe6 View commit details
    Browse the repository at this point in the history

  6. Changed all view headers in market as <h3>s

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    f9af157 View commit details
    Browse the repository at this point in the history

  7. created homepage and its css stylesheet as well as application.html.e… 

    …rb and its css file. Haven't added links to 'act as ..' yet.
    @yenicapotediaz
    yenicapotediaz committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    9c94d68 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'b/nmu+ycd/master' of https://github.com/nurlywhirly/Far… 

    …MarRails into b/nmu+ycd/master
    @yenicapotediaz
    yenicapotediaz committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    98c81b6 View commit details
    Browse the repository at this point in the history

  9. Added all standard views for vendor-related stuff.

    @nurlywhirly
    nurlywhirly committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    2be1daf View commit details
    Browse the repository at this point in the history

  10. created stylesheet for market home and market show.

    @yenicapotediaz
    yenicapotediaz committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    503be4e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'b/nmu+ycd/master' of https://github.com/nurlywhirly/Far… 

    …MarRails into b/nmu+ycd/master
    @yenicapotediaz
    yenicapotediaz committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    b98903c View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Created Vendor/Products index page, partial products_forms and views.… 

    … Links not tested.
    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    eb7bee8 View commit details
    Browse the repository at this point in the history

  2. Sucessfully got destroy id from view all products by vendor index page.

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    d03c8d1 View commit details
    Browse the repository at this point in the history

  3. Fixed problem on vendor/product/show page bc I was pointing to vendor… 

    …_id instead of product_id for some random reason
    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    9b77825 View commit details
    Browse the repository at this point in the history

  4. Tested deleting and adding products for a vendor successfully

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    4c4d4d1 View commit details
    Browse the repository at this point in the history

  5. worked on vendor pages layout, included nav bar in the application la… 

    …yout page to show on every page instead of putting it in every single page ever.
    @yenicapotediaz
    yenicapotediaz committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    795f815 View commit details
    Browse the repository at this point in the history

  6. Solved problem where you could only edit a product once.

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    20cc48e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'b/nmu+ycd/master' of https://github.com/nurlywhirly/Far… 

    …MarRails into b/nmu+ycd/master
    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    7a02de3 View commit details
    Browse the repository at this point in the history

  8. Fixed all forms where the table begins inside the form code and not o… 

    …utside
    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    982725d View commit details
    Browse the repository at this point in the history

  9. Added strong params in market, product, and vendor controllers

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    05b4d07 View commit details
    Browse the repository at this point in the history

  10. Got markets to show its vendors.

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    9c58a38 View commit details
    Browse the repository at this point in the history

  11. Made the add new vendor link dependant on you being a market

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ae70640 View commit details
    Browse the repository at this point in the history

  12. We tried to do something in the vendor model, but decided to stop.

    @nurlywhirly
    nurlywhirly committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    071b4a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Added all the pages for sales-related things, most links probably work.

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    e75e4bf View commit details
    Browse the repository at this point in the history

  2. Added a mixin for methods to determine which path we're on - vendor, … 

    …product, or market
    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    65f19a2 View commit details
    Browse the repository at this point in the history

  3. cleaned up css and layout for market.

    @yenicapotediaz
    yenicapotediaz committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    226ac6b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'b/nmu+ycd/master' of https://github.com/nurlywhirly/Far… 

    …MarRails into b/nmu+ycd/master
    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    9550fcb View commit details
    Browse the repository at this point in the history

  5. Updated .gitignore

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    a0b1d1e View commit details
    Browse the repository at this point in the history

  6. Fixed forms for conditionally filling in ID field where possible usin… 

    …g params
    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    c5da663 View commit details
    Browse the repository at this point in the history

  7. Adding class names to partial forms table elements

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    6915ac9 View commit details
    Browse the repository at this point in the history

  8. Fixing routes yet again.

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    8583eb0 View commit details
    Browse the repository at this point in the history

  9. cleaned up styles for product

    @yenicapotediaz
    yenicapotediaz committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    0e2fd7c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'b/nmu+ycd/master' of https://github.com/nurlywhirly/Far… 

    …MarRails into b/nmu+ycd/master
    @yenicapotediaz
    yenicapotediaz committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    48e5dba View commit details
    Browse the repository at this point in the history

  11. Trying to fix the problems I caused by fixing routes

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    c8179d7 View commit details
    Browse the repository at this point in the history

  12. Added last month's sales as a list on vendor/sales page.

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    c85ab21 View commit details
    Browse the repository at this point in the history

  13. First draft of project to deploy to Heroku

    @nurlywhirly
    nurlywhirly committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    3e37f59 View commit details
    Browse the repository at this point in the history

  14. Updating gemfile to deploy to heroku

    @yenicapotediaz
    yenicapotediaz committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    32fa813 View commit details
    Browse the repository at this point in the history

  15. adding Gemfile.lock

    @yenicapotediaz
    yenicapotediaz committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    6b9b917 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2016

  1. testing correct links to nav bar

    @yenicapotediaz
    yenicapotediaz committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    6012ab8 View commit details
    Browse the repository at this point in the history

  2. testing correct links to nav bar -take 2

    @yenicapotediaz
    yenicapotediaz committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    5590a17 View commit details
    Browse the repository at this point in the history

  3. testing correct links to nav bar -take 3

    @yenicapotediaz
    yenicapotediaz committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    19dbdb9 View commit details
    Browse the repository at this point in the history

  4. fixed links in homepage from localhost:3000 to actual path links

    @yenicapotediaz
    yenicapotediaz committed Oct 9, 2016
    Configuration menu
    Copy the full SHA
    f7e6b30 View commit details
    Browse the repository at this point in the history