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

Water && Fire @ THE BESTIES: Sandy, Ida, Beatrice and Hanh Solo #62

Open
wants to merge 179 commits into
base: master
Choose a base branch
from
Open

Water && Fire @ THE BESTIES: Sandy, Ida, Beatrice and Hanh Solo #62

wants to merge 179 commits into from

Commits on Nov 17, 2020

  1. Ran rails nw

    @Beatress
    Beatress committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    11a6e97 View commit details
    Browse the repository at this point in the history

  2. Updated gitignore to exclude env and idea

    @Beatress
    Beatress committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    d288751 View commit details
    Browse the repository at this point in the history

  3. Generated migrations for product, merchant, order, orderitem

    @Beatress
    Beatress committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    886093c View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. Ran rails db:migrate and made model relations

    @Beatress
    Beatress committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    8dbc181 View commit details
    Browse the repository at this point in the history

  2. Updated lockfile and generated Merchants controller

    @Beatress
    Beatress committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    5f5923e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. Added controllers to petsy

    Sandy committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    7b40d2b View commit details
    Browse the repository at this point in the history

  2. Removed order_item_id reference column from order table

    @Beatress
    Beatress committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    f17c7eb View commit details
    Browse the repository at this point in the history

  3. Added seed data

    @Beatress
    Beatress committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    d7d1861 View commit details
    Browse the repository at this point in the history

  4. added indirect relationship

    Sandy committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    06a5d70 View commit details
    Browse the repository at this point in the history

  5. added indirect relationship

    Sandy committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    04052dd View commit details
    Browse the repository at this point in the history

  6. added merchant and product views and index controller action

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    6ca9594 View commit details
    Browse the repository at this point in the history

  7. initial style push to sandy-pEtsy-theme

    Sandy committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    1b13306 View commit details
    Browse the repository at this point in the history

  8. Added basic product CRUD

    @Beatress
    Beatress committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    2501dd0 View commit details
    Browse the repository at this point in the history

  9. Some basic CRUD and view refinements for product/merchant

    @Beatress
    Beatress committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    67f1e8e View commit details
    Browse the repository at this point in the history

  10. add validations for merchant class

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    7df9f20 View commit details
    Browse the repository at this point in the history

  11. added validations for product and orderitem classes

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    09a74c1 View commit details
    Browse the repository at this point in the history

  12. updated product validation

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    df59510 View commit details
    Browse the repository at this point in the history

  13. added validation and relationship tests for Product class

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    48be2df View commit details
    Browse the repository at this point in the history

  14. updated merchant and product test validations

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    f12b296 View commit details
    Browse the repository at this point in the history

  15. Set up omniauth, .env and initilaizer

    @seattlefurby17
    seattlefurby17 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    45bdd50 View commit details
    Browse the repository at this point in the history

  16. create method and helper method for merchants

    @seattlefurby17
    seattlefurby17 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    0b4ef09 View commit details
    Browse the repository at this point in the history

  17. added products controller tests

    @idago123
    idago123 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    65d4f10 View commit details
    Browse the repository at this point in the history

  18. log_out, current_user methods

    @seattlefurby17
    seattlefurby17 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    c979cef View commit details
    Browse the repository at this point in the history

  19. Updated Oauth testing for merchants

    @seattlefurby17
    seattlefurby17 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    ce46b2c View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Merge pull request #2 from seattlefurby17/testing 

    Testing
    @idago123
    idago123 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    421bd5f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from seattlefurby17/product-crud 

    Product crud
    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    82a6ca5 View commit details
    Browse the repository at this point in the history

  3. Fixed merchant controller tests

    @seattlefurby17
    seattlefurby17 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    ac761e8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Oauth_Users

    @seattlefurby17
    seattlefurby17 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    3ab82b3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3 from seattlefurby17/Oauth_Users 

    Oauth users
    @seattlefurby17
    seattlefurby17 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    a29232a View commit details
    Browse the repository at this point in the history

  6. Merged conflict fixed

    @seattlefurby17
    seattlefurby17 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    beeec44 View commit details
    Browse the repository at this point in the history

  7. Merge fixed

    @seattlefurby17
    seattlefurby17 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    4041721 View commit details
    Browse the repository at this point in the history

  8. adding theme

    Sandy committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    02ffd3a View commit details
    Browse the repository at this point in the history

  9. Testing new theme with master

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    be6f55c View commit details
    Browse the repository at this point in the history

  10. created new data

    @idago123
    idago123 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    eaac552 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'test-branch-theme' into sandy-pEtsy-theme

    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    64904d6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #4 from seattlefurby17/sandy-pEtsy-theme 

    Sandy pEtsy theme
    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    139767d View commit details
    Browse the repository at this point in the history

  13. Merge pull request #5 from seattlefurby17/seed 

    created new data
    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    239b16f View commit details
    Browse the repository at this point in the history

  14. Updated products controller

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    7d8c6fb View commit details
    Browse the repository at this point in the history

  15. Merge branch 'test-branch-theme' of github.com:seattlefurby17/betsy i… 

    …nto test-branch-theme
    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    9c01b1c View commit details
    Browse the repository at this point in the history

  16. Moved homepages content to application

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    7069b38 View commit details
    Browse the repository at this point in the history

  17. Product CRUD almost finished, need review of create product bug

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    5e001f0 View commit details
    Browse the repository at this point in the history

  18. added products show view

    @idago123
    idago123 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    33d1441 View commit details
    Browse the repository at this point in the history

  19. Added hidden merchant to form

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    a8a62b8 View commit details
    Browse the repository at this point in the history

  20. added tests to product controller and show view

    @idago123
    idago123 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    adda9eb View commit details
    Browse the repository at this point in the history

  21. Merge pull request #6 from seattlefurby17/view 

    View
    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    cbc7bf6 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' into test-branch-theme

    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    370da19 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #7 from seattlefurby17/test-branch-theme 

    Implemented Sandy's theme work with some extra product CRUD
    @Beatress
    Beatress authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    677e01d View commit details
    Browse the repository at this point in the history

  24. Product page integrated with theme

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    24fe640 View commit details
    Browse the repository at this point in the history

  25. Fixed bug preventing add product - needed product_params

    @Beatress
    Beatress committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    c385924 View commit details
    Browse the repository at this point in the history

  26. updated Order controller and views

    @idago123
    idago123 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    f44ff47 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. Updated application_controller shopper method

    @seattlefurby17
    seattlefurby17 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    c307476 View commit details
    Browse the repository at this point in the history

  2. Added new indirect model relation and refactored shopper method

    @Beatress
    Beatress committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    9013f4d View commit details
    Browse the repository at this point in the history

  3. Refactored add_to_cart and edit_quantity to be in order_item controll… 

    …er, implemented use of quantity in cart management
    @Beatress
    Beatress committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    fbd8129 View commit details
    Browse the repository at this point in the history

  4. added fixtures file for products

    @idago123
    idago123 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    02fa0b3 View commit details
    Browse the repository at this point in the history

  5. Apply suggestions from code review

    @Beatress
    Beatress authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    9aaeae7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #8 from seattlefurby17/quantity 

    Implemeneted quantity
    @Beatress
    Beatress authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    4b5a930 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #9 from seattlefurby17/fixtures 

    added fixtures file for products
    @Beatress
    Beatress authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    a25fd18 View commit details
    Browse the repository at this point in the history

  8. cart changes

    @idago123
    idago123 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    71d3a56 View commit details
    Browse the repository at this point in the history

  9. Added missing quotation mark

    @Beatress
    Beatress committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    3e4cf79 View commit details
    Browse the repository at this point in the history

  10. view change

    @idago123
    idago123 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    1f27ec5 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/seattlefurby17/betsy into… 

    … master
    @idago123
    idago123 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    e85952e View commit details
    Browse the repository at this point in the history

  12. Fixed merge conflicts

    @Beatress
    Beatress committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    901a251 View commit details
    Browse the repository at this point in the history

  13. Checkout form, method, routes and migrate

    @seattlefurby17
    seattlefurby17 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    5e40a97 View commit details
    Browse the repository at this point in the history

  14. Order processing method

    @seattlefurby17
    seattlefurby17 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    c84c00a View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2020

  1. Added redirect to order controller, added show page, and finished pro… 

    …cess_order action
    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    7d5a15d View commit details
    Browse the repository at this point in the history

  2. initial commit

    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    c429473 View commit details
    Browse the repository at this point in the history

  3. removed search bar and made footer sticky from application.html.erb

    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    1339a44 View commit details
    Browse the repository at this point in the history

  4. Removed unused routes

    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    651c577 View commit details
    Browse the repository at this point in the history

  5. Removed old cart view code from merge

    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    53650d7 View commit details
    Browse the repository at this point in the history

  6. Added padding to body and cards

    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    b073386 View commit details
    Browse the repository at this point in the history

  7. Fixed tests

    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    f07a358 View commit details
    Browse the repository at this point in the history

  8. Added products to merchants page and editing of products only by auth… 

    …orized merchant
    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    7c95836 View commit details
    Browse the repository at this point in the history

  9. All tests passing

    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    87abd3a View commit details
    Browse the repository at this point in the history

  10. Added checkout form styling

    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    b04bb7a View commit details
    Browse the repository at this point in the history

  11. Added correct labels to checkout styling form

    Sandy committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    935a9ea View commit details
    Browse the repository at this point in the history

  12. order model - validations testing

    @seattlefurby17
    seattlefurby17 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    9828a11 View commit details
    Browse the repository at this point in the history

  13. added remove from cart feature to order items and updated the cart view

    @idago123
    idago123 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    0dc4001 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #10 from seattlefurby17/bea-saturday 

    A cool PR
    @Beatress
    Beatress authored Nov 22, 2020
    Configuration menu
    Copy the full SHA
    19f7aa2 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #12 from seattlefurby17/removecart 

    added remove from cart feature to order items and updated the cart view
    @Beatress
    Beatress authored Nov 22, 2020
    Configuration menu
    Copy the full SHA
    eee87b1 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #11 from seattlefurby17/model_testing 

    order model - validations testing
    @Beatress
    Beatress authored Nov 22, 2020
    Configuration menu
    Copy the full SHA
    9e5d541 View commit details
    Browse the repository at this point in the history

  17. Added order items path to routes file

    @Beatress
    Beatress committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    b5061b4 View commit details
    Browse the repository at this point in the history

  18. Order model validation tests

    @seattlefurby17
    seattlefurby17 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    188a729 View commit details
    Browse the repository at this point in the history

  19. merge fixed

    @seattlefurby17
    seattlefurby17 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    db193ca View commit details
    Browse the repository at this point in the history

  20. checkout-client side validation

    @seattlefurby17
    seattlefurby17 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    8d7f074 View commit details
    Browse the repository at this point in the history

  21. updated order and order_item methods for testing

    @seattlefurby17
    seattlefurby17 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    ef33814 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. Spotlight for homepage

    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    5c01dbe View commit details
    Browse the repository at this point in the history

  2. Added styling to checkout form, added fields for city and state, adde… 

    …d strong params for city and state.
    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    0c9ae2f View commit details
    Browse the repository at this point in the history

  3. Added styling to checkout form, added fields for city and state, adde… 

    …d strong params for city and state.
    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    efdcfb0 View commit details
    Browse the repository at this point in the history

  4. Updating testing and show err message in order

    @seattlefurby17
    seattlefurby17 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    6733a7c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into sandy-bootstrap-form

    @Beatress
    Beatress authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    657b79f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13 from seattlefurby17/sandy-bootstrap-form 

    Sandy bootstrap form
    @Beatress
    Beatress authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    dcf98c1 View commit details
    Browse the repository at this point in the history

  7. Fixed syntax error on cart page

    @Beatress
    Beatress committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    a67c5c8 View commit details
    Browse the repository at this point in the history

  8. merge fixed

    @seattlefurby17
    seattlefurby17 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    e6373ab View commit details
    Browse the repository at this point in the history

  9. Updated order model tests

    @seattlefurby17
    seattlefurby17 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    66bb561 View commit details
    Browse the repository at this point in the history

  10. Added photo urls to seed data

    @Beatress
    Beatress committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    a0a78ef View commit details
    Browse the repository at this point in the history

  11. Added files

    @Beatress
    Beatress committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    d314c3d View commit details
    Browse the repository at this point in the history

  12. updated order model testing and simplcov

    @seattlefurby17
    seattlefurby17 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    45924d1 View commit details
    Browse the repository at this point in the history

  13. Fixed cart bug with validations, added allow_nil

    @Beatress
    Beatress committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    d83de66 View commit details
    Browse the repository at this point in the history

  14. Worked on homepage, recreated schema

    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    b593d70 View commit details
    Browse the repository at this point in the history

  15. Created styling for churro pic

    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    5ea0d44 View commit details
    Browse the repository at this point in the history

  16. More styling for homepage

    Sandy committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    248203e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. updating show merchant

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    7ec2233 View commit details
    Browse the repository at this point in the history

  2. added order tests, total revenue and total_num methods to merchant mo… 

    …del, and updated order index view
    @idago123
    idago123 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    1b36523 View commit details
    Browse the repository at this point in the history

  3. added links to each individual order

    @idago123
    idago123 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ecf530c View commit details
    Browse the repository at this point in the history

  4. deleted commented out code

    @idago123
    idago123 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    1ad4853 View commit details
    Browse the repository at this point in the history

  5. updated view

    @idago123
    idago123 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ccc8b41 View commit details
    Browse the repository at this point in the history

  6. index view for order

    @idago123
    idago123 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    cbac1b7 View commit details
    Browse the repository at this point in the history

  7. Created order details page

    Sandy committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ee629b8 View commit details
    Browse the repository at this point in the history

  8. orders show page

    Sandy committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    f275dad View commit details
    Browse the repository at this point in the history

  9. index on master: 7ec2233 updating show merchant

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5d99ee2 View commit details
    Browse the repository at this point in the history

  10. WIP on master: 7ec2233 updating show merchant

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5808777 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #15 from seattlefurby17/fullfilment 

    Fullfilment
    @Beatress
    Beatress authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    2ada46a View commit details
    Browse the repository at this point in the history

  12. Fixed merge conflict

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    512df63 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of github.com:seattlefurby17/betsy

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    cb80407 View commit details
    Browse the repository at this point in the history

  14. order_item testing, merchant relation testing

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ca89b5d View commit details
    Browse the repository at this point in the history

  15. Updated orders.yml

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    2e7c776 View commit details
    Browse the repository at this point in the history

  16. Fixed bugs, all tests passing

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ea5b8f1 View commit details
    Browse the repository at this point in the history

  17. Tests updated

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    fd0c2c5 View commit details
    Browse the repository at this point in the history

  18. updated tests

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0edbc8f View commit details
    Browse the repository at this point in the history

  19. Changed a space

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    4d5f356 View commit details
    Browse the repository at this point in the history

  20. fixed order page authentication bug

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    8c9b789 View commit details
    Browse the repository at this point in the history

  21. added conditional logic to show cart or order details page in navigat… 

    …ion bar
    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    d03a136 View commit details
    Browse the repository at this point in the history

  22. added shopper details to order details page

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    b4a31ff View commit details
    Browse the repository at this point in the history

  23. Fixed order show page authentication

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    6a0b954 View commit details
    Browse the repository at this point in the history

  24. Merchant dashboard finished

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    f5eb69a View commit details
    Browse the repository at this point in the history

  25. Added product retire/unretire functionality

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    520de93 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #16 from seattlefurby17/bea_Monday 

    All site features completed!
    @Beatress
    Beatress authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c5cc31d View commit details
    Browse the repository at this point in the history

  27. application_controller fixed spacing

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0b722fe View commit details
    Browse the repository at this point in the history

  28. updated testing and require login for merchant

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    7f9d68f View commit details
    Browse the repository at this point in the history

  29. Added ability to have multiple orders per user

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    900d6cd View commit details
    Browse the repository at this point in the history

  30. Added proper currency formatting everywhere

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c5dc460 View commit details
    Browse the repository at this point in the history

  31. Update orders_table.html.erb

    @Beatress
    Beatress authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    2617d41 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #18 from seattlefurby17/multiple_orders 

    NOW we're at function freeze :^)
    @idago123
    idago123 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0462a6f View commit details
    Browse the repository at this point in the history

  33. Merge branch 'master' into model_testing

    @seattlefurby17
    seattlefurby17 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    76463e0 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #17 from seattlefurby17/model_testing 

    Model testing
    @seattlefurby17
    seattlefurby17 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    6e4988e View commit details
    Browse the repository at this point in the history

  35. Applied suggestions from code review

    @Beatress
    Beatress committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    fc32d7c View commit details
    Browse the repository at this point in the history

  36. Merges fixed

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    b60c7bd View commit details
    Browse the repository at this point in the history

  37. merges fixed

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    575a7db View commit details
    Browse the repository at this point in the history

  38. product model relations tests

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    223efd1 View commit details
    Browse the repository at this point in the history

  39. order model tests completed

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    b881304 View commit details
    Browse the repository at this point in the history

  40. updated test helper for simplecov

    @seattlefurby17
    seattlefurby17 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    06bc5f5 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. Added google font

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    ca1c2d8 View commit details
    Browse the repository at this point in the history

  2. Added rounded corners to pics

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    1693325 View commit details
    Browse the repository at this point in the history

  3. updated homepages controller test

    @seattlefurby17
    seattlefurby17 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    ed9e258 View commit details
    Browse the repository at this point in the history

  4. added retire tests

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    5e8133d View commit details
    Browse the repository at this point in the history

  5. Updated test_helper simplecov

    @seattlefurby17
    seattlefurby17 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    61bd34a View commit details
    Browse the repository at this point in the history

  6. Wrote tests for merchant and order controller

    @Beatress
    Beatress committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    71c1ce7 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from seattlefurby17/tuesday-tests 

    Wrote tests for merchant and order controller
    @Beatress
    Beatress authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    edbdfd6 View commit details
    Browse the repository at this point in the history

  8. added find product

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    8053698 View commit details
    Browse the repository at this point in the history

  9. added find product test

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    9d10aba View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from seattlefurby17/productcontroller 

    Productcontroller
    @Beatress
    Beatress authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    7889dc9 View commit details
    Browse the repository at this point in the history

  11. Added test framework for order items

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    efc6f5f View commit details
    Browse the repository at this point in the history

  12. Added test framework for order items

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    8128bc9 View commit details
    Browse the repository at this point in the history

  13. merchant model tests

    @seattlefurby17
    seattlefurby17 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    3478614 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #21 from seattlefurby17/sandy-branch-03 

    Sandy branch 03
    sandy authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    7d665b7 View commit details
    Browse the repository at this point in the history

  15. initial push

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    b1cc87e View commit details
    Browse the repository at this point in the history

  16. Merge pull request #22 from seattlefurby17/sandy-tests-branch 

    Sandy tests branch
    sandy authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    e43ea79 View commit details
    Browse the repository at this point in the history

  17. merchant model tests

    @seattlefurby17
    seattlefurby17 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    0fc8e38 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/seattlefurby17/betsy into… 

    … master
    @seattlefurby17
    seattlefurby17 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    8a73d31 View commit details
    Browse the repository at this point in the history

  19. Added check for product not found in add to cart

    @Beatress
    Beatress committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    b5059a7 View commit details
    Browse the repository at this point in the history

  20. order item tests

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    b777715 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into sandy-tests-branch

    sandy authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    0a8bedc View commit details
    Browse the repository at this point in the history

  22. Merge pull request #23 from seattlefurby17/sandy-tests-branch 

    order item tests
    sandy authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    8ebf23f View commit details
    Browse the repository at this point in the history

  23. added more tests including edge cases for total rev, total num and to… 

    …tal orders
    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    02c9e5f View commit details
    Browse the repository at this point in the history

  24. updated total orders test

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    d62d556 View commit details
    Browse the repository at this point in the history

  25. more files

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    3c96e68 View commit details
    Browse the repository at this point in the history

  26. 98% coverage

    @Beatress
    Beatress committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    7bf7307 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' of github.com:seattlefurby17/betsy

    @Beatress
    Beatress committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    a39fe27 View commit details
    Browse the repository at this point in the history

  28. Added social media icons to footer 

    Added spacing to homepage title for better presentation
Added border to homepage pictures to match products page
Added more pics of Churro
    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    471c5d6 View commit details
    Browse the repository at this point in the history

  29. added social media icons

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    ac3fa61 View commit details
    Browse the repository at this point in the history

  30. Added social media icons to footer 

    Added spacing to homepage title for better presentation
Added border to homepage pictures to match products page
Added more pics of Churro
    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    00e351d View commit details
    Browse the repository at this point in the history

  31. Added styling to order summary receipt

    Sandy committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    18391ea View commit details
    Browse the repository at this point in the history

  32. Merge pull request #24 from seattlefurby17/sandy-bootstrap-form 

    Sandy bootstrap form
    @Beatress
    Beatress authored Nov 25, 2020
    Configuration menu
    Copy the full SHA
    6b54a8c View commit details
    Browse the repository at this point in the history

  33. deleted currency conversion total num of orders

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    7d9789e View commit details
    Browse the repository at this point in the history

  34. updated orders index view

    @idago123
    idago123 committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    c8d7995 View commit details
    Browse the repository at this point in the history

  35. Removed coverage files from repo

    @Beatress
    Beatress committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    970822b View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2020

  1. view for order index

    @idago123
    idago123 committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    38ba9bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/seattlefurby17/betsy into… 

    … master
    @idago123
    idago123 committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    f7bd54f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. added margins for better look

    Sandy committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    82f14af View commit details
    Browse the repository at this point in the history