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

Product frontend #59

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

Product frontend #59

wants to merge 326 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Nov 19, 2020

  1. LOGO

    @steve-messing
    steve-messing committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    797427c View commit details
    Browse the repository at this point in the history

  2. added user to products in tests

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

  3. skipped failing product_controller tests :(

    @steve-messing
    steve-messing committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    280ffc7 View commit details
    Browse the repository at this point in the history

  4. order attributes in cart, delete order model/controller, able to chec… 

    …kout/purchase cart
    @agesak
    agesak committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    46db59f View commit details
    Browse the repository at this point in the history

  5. use model in purchase_form and use strong params

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

  6. add category button

    @steve-messing
    steve-messing committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    572fbea View commit details
    Browse the repository at this point in the history

  7. add category button

    @steve-messing
    steve-messing committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    64a8d80 View commit details
    Browse the repository at this point in the history

  8. remove relation of cart/order

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

  9. Merge pull request #11 from lina5147/kma_ld/cart_order_connected 

    Cart Order connected
    @r-spiel
    r-spiel authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    04ed783 View commit details
    Browse the repository at this point in the history

  10. drying up tests for cartitems controller, create and destroy method s… 

    …pecificially
    @lina5147
    lina5147 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    ad4a547 View commit details
    Browse the repository at this point in the history

  11. tried changing a route from post to patch but it broke things so i re… 

    …verted back to post
    @lina5147
    lina5147 committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    f838806 View commit details
    Browse the repository at this point in the history

  12. not too sure what i did, forgot to commit changes up to this point

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

  13. delete orders.yml

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

Commits on Nov 20, 2020

  1. figured out how to test add and reduce method

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

  2. added another test to add_qty method, testing inventory

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

  3. added flash success message to when adding item to cart

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

  4. as a merchant, I can't edit or delete a product I don't own.

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    50562bf View commit details
    Browse the repository at this point in the history

  5. removed order.yml

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

  6. add category button

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    3cd51ea View commit details
    Browse the repository at this point in the history

  7. user can browse products by merchant

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    7dc94b4 View commit details
    Browse the repository at this point in the history

  8. cart model validations/relations tests

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

  9. Cartitem model tests

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

  10. empty cart when place order

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

  11. added some CSS don't judge me

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    7f47dd2 View commit details
    Browse the repository at this point in the history

  12. dry up cartitems controller tests

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

  13. added some CSS don't judge me

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    99f51d7 View commit details
    Browse the repository at this point in the history

  14. Revert "empty cart when place order" 

    This reverts commit 026190a.
    @agesak
    agesak committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    d80d277 View commit details
    Browse the repository at this point in the history

  15. empty cart when place order

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

  16. Revert "dry up cartitems controller tests" 

    This reverts commit ce117b3.
    @agesak
    agesak committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    e0ea448 View commit details
    Browse the repository at this point in the history

  17. but if i was gonna write this test tonight, this is what it would do

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

  18. simplecov for test coverage

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

  19. moved add item to cart to products controller

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

  20. moved adding item to cart from cartitem controller to product in route

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

  21. added comments

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

  22. changed cart item from an instance variable to a local variable

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

  23. commented out create action in cartitems controller

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

  24. fix syntax errror in add to cart route

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

  25. added more tests to compare before and after quantities for the add a… 

    …nd reduce methods
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    6d816e1 View commit details
    Browse the repository at this point in the history

  26. not working attempt at category yml

    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    581d868 View commit details
    Browse the repository at this point in the history

  27. testing add to cart method that it can add a new cart item

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

  28. incorrectly placed add to cart test to cart when it should be in prod… 

    …ucts tests
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    d6eb678 View commit details
    Browse the repository at this point in the history

  29. products show view, changed the add to cart path

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

  30. try with category_id

    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    4fd976d View commit details
    Browse the repository at this point in the history

  31. removed relate order migration

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

  32. add coverage to gitignore

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

  33. Merge branch 'master' of https://github.com/lina5147/betsy

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

  34. accept schema changes

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    85fa198 View commit details
    Browse the repository at this point in the history

  35. Merge branch 'master' of https://github.com/lina5147/betsy into ld-ca… 

    …rtitem_tests
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    52474a4 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #12 from lina5147/ld-cartitem_tests 

    Ld - cartitem tests
    @lina5147
    lina5147 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    24428eb View commit details
    Browse the repository at this point in the history

  37. Merge branch 'master' of https://github.com/lina5147/betsy

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

  38. Merge pull request #13 from lina5147/user-auth 

    User auth
    @lina5147
    lina5147 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    1f9920c View commit details
    Browse the repository at this point in the history

  39. Merge branch 'master' of https://github.com/lina5147/betsy

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

  40. Merge pull request #14 from lina5147/kma/cart_validations 

    Kma/cart validations
    @lina5147
    lina5147 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    5820a0e View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' of https://github.com/lina5147/betsy

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

  42. merge.... 

    Merge branch 'master' of https://github.com/lina5147/betsy
    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    554a4a3 View commit details
    Browse the repository at this point in the history

  43. removed create action from cart items

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

  44. merging 

    Merge branch 'master' of https://github.com/lina5147/betsy
    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    24b32a9 View commit details
    Browse the repository at this point in the history

  45. resolved merge conflicts

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

  46. Merge branch 'master' of https://github.com/lina5147/betsy into ld-mo… 

    …ve_add_to_cart
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    3fe2345 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #15 from lina5147/ld-move_add_to_cart 

    Ld move add to cart
    @agesak
    agesak authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    557b3ef View commit details
    Browse the repository at this point in the history

  48. Merge branch 'master' of https://github.com/lina5147/betsy

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    f4d159d View commit details
    Browse the repository at this point in the history

  49. removed create action tests for cartitem controller

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

  50. Merge branch 'master' of https://github.com/lina5147/betsy

    @steve-messing
    steve-messing committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    d2ed136 View commit details
    Browse the repository at this point in the history

  51. incorrect path was causing error, switched to add_to_cart path, and a… 

    …dded more expects to reduce qty test
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    0f75533 View commit details
    Browse the repository at this point in the history

  52. changed another incorrect path in the destroy action test

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

  53. Merge pull request #16 from lina5147/ld-fix_test_errors_for_cartitems 

    Ld fix test errors for cartitems
    @r-spiel
    r-spiel authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    8307d4f View commit details
    Browse the repository at this point in the history

  54. Merge branch 'master' of https://github.com/lina5147/betsy into categ… 

    …ories_testing
    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    878410e View commit details
    Browse the repository at this point in the history

  55. fixed an error on add to cart test, its passing now 

    quit
    @lina5147
    lina5147 committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    3f2b111 View commit details
    Browse the repository at this point in the history

  56. Merge pull request #17 from lina5147/ld-fix_add_to_cart_test 

    fixed an error on add to cart test, its passing now
    @r-spiel
    r-spiel authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    2160adb View commit details
    Browse the repository at this point in the history

  57. Merge branch 'master' of https://github.com/lina5147/betsy into categ… 

    …ories_testing
    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    c3ee75c View commit details
    Browse the repository at this point in the history

  58. category fixtures

    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    801d5d0 View commit details
    Browse the repository at this point in the history

  59. comment out line 89 products_controller_test and skip in categories_c… 

    …ontroller_tests
    @r-spiel
    r-spiel committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    dffab1d View commit details
    Browse the repository at this point in the history

  60. Merge pull request #18 from lina5147/categories_testing 

    Categories testing
    @lina5147
    lina5147 authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    83611cf View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. cart purchase fails when info isnt filled out (and tests)

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

  2. display poorly formatted error messages when order purchase validatio… 

    …ns not met
    @agesak
    agesak committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    c848f86 View commit details
    Browse the repository at this point in the history

  3. refactor the new category form add @category to the application contr… 

    …oller
    @r-spiel
    r-spiel committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    8d2087a View commit details
    Browse the repository at this point in the history

  4. added new method to update inventory after a successful purchase

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

  5. working on tests to inventory update and fixed flash success message … 

    …for add to cart method
    @lina5147
    lina5147 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    226a279 View commit details
    Browse the repository at this point in the history

  6. save test progress

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

  7. was experimenting with the code but reverted back

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

  8. added a method to calculate the total for the cartitem, and the cart … 

    …view page- added $ sign and round to 2 decimal places
    @lina5147
    lina5147 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    75be81f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #19 from lina5147/ld-Update_inventory 

    Ld update inventory
    @agesak
    agesak authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    039f956 View commit details
    Browse the repository at this point in the history

  10. added a new migration to change product cost datatype tp float

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

  11. it would wouldnt it

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

  12. added a new migration to change cartitem cost datatype tp float

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

  13. a poorly formatted confirmation page yay

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

  14. Merge pull request #20 from lina5147/ld-change_cost_datatype 

    Ld change cost datatype
    @r-spiel
    r-spiel authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    a8e6923 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/lina5147/betsy into rms/u… 

    …ser_dashboard
    @r-spiel
    r-spiel committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    b6ca1d9 View commit details
    Browse the repository at this point in the history

  16. committing so i can switch branches

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

  17. pulling linas schema change

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

  18. Merge branch 'master' into ld-tax_and_total_cost

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

  19. update schema

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

  20. added total price method to cart model and added the total price to t… 

    …he cart show page
    @lina5147
    lina5147 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    2d809bf View commit details
    Browse the repository at this point in the history

  21. added product owner model method

    @steve-messing
    steve-messing committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    9e8e11b View commit details
    Browse the repository at this point in the history

  22. added product owner model method to show page

    @steve-messing
    steve-messing committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    ec23ff4 View commit details
    Browse the repository at this point in the history

  23. added product owner model method to show page

    @steve-messing
    steve-messing committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    44309e3 View commit details
    Browse the repository at this point in the history

  24. round total price to 2 decimal places

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

  25. added a test for cartitem subtotal method

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

  26. added a test for total price and added new carts and cart items fixtu… 

    …re data
    @lina5147
    lina5147 committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    13cdffc View commit details
    Browse the repository at this point in the history

  27. update new category form partial, only in layouts folder'

    @r-spiel
    r-spiel committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    f201700 View commit details
    Browse the repository at this point in the history

  28. added another test for total price, return 0 for no cart items listed

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

  29. update user dashboard page

    @r-spiel
    r-spiel committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    f3ba5ac View commit details
    Browse the repository at this point in the history

  30. Merge pull request #21 from lina5147/ld-cartitem_and_cart_total_cost 

    Ld cartitem and cart total cost
    @r-spiel
    r-spiel authored Nov 21, 2020
    Configuration menu
    Copy the full SHA
    9b286fd View commit details
    Browse the repository at this point in the history

  31. revert back action_name in product edit page partial render

    @r-spiel
    r-spiel committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    8de967e View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2020

  1. update application html

    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    785c8bf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #22 from lina5147/rms/user_dashboard 

    Rms/user dashboard
    @lina5147
    lina5147 authored Nov 22, 2020
    Configuration menu
    Copy the full SHA
    b1348d4 View commit details
    Browse the repository at this point in the history

  3. Add indirect relationship: user has many cart_items thru product

    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    4ada28f View commit details
    Browse the repository at this point in the history

  4. migration to add column fulfillment_status to cartitems table

    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    fae592d View commit details
    Browse the repository at this point in the history

  5. fulfillment method to get merchant orders by cart status

    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    daa3082 View commit details
    Browse the repository at this point in the history

  6. committing so i can switch branches

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

  7. Merge branch 'master' of https://github.com/lina5147/betsy

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

  8. updates to views

    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    b6d269d View commit details
    Browse the repository at this point in the history

  9. tests are weird

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

  10. when a product's price changes, made sure to change cartitems in pend… 

    …ing cart to reflect that change
    @lina5147
    lina5147 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    ce82d18 View commit details
    Browse the repository at this point in the history

  11. turned it into a model method in products, update cartitems method

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

  12. added tests for update cartitems method

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

  13. changed the cart button to a cart image

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

  14. css styling cart show page, changing image size, aligning text and bu… 

    …ttons
    @lina5147
    lina5147 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    05d8e4b View commit details
    Browse the repository at this point in the history

  15. css styling the cart summary

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

  16. changed remove button to X

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

  17. changed the order of the cartitems in the cart to decending order by … 

    …creation date, won't jump around when changing quantity
    @lina5147
    lina5147 committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    9d7f825 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/lina5147/betsy into rms/u… 

    …ser_dashboard_pt2
    @r-spiel
    r-spiel committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    ecf40ff View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' of https://github.com/lina5147/betsy

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

  20. Merge branch 'master' of https://github.com/lina5147/betsy

    @steve-messing
    steve-messing committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    e763bfe View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/lina5147/betsy into sem-U… 

    …ser-Product-Auth-Tests
    @steve-messing
    steve-messing committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    5aff86a View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. products_controller auth tests passing!

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    d1a6c52 View commit details
    Browse the repository at this point in the history

  2. add table partial for orders, try to get route/update method for cart… 

    …item status, not working yet
    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    156df04 View commit details
    Browse the repository at this point in the history

  3. product model tests passing!

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    fa84ade View commit details
    Browse the repository at this point in the history

  4. update params in update_status method for cartitems

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    70b608e View commit details
    Browse the repository at this point in the history

  5. minor changes white space, comments etc.

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    0609467 View commit details
    Browse the repository at this point in the history

  6. some tests for the user model, comments lining out some future tests … 

    …for user controller
    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    32551f2 View commit details
    Browse the repository at this point in the history

  7. fix no ending div in cart show page

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    3684b83 View commit details
    Browse the repository at this point in the history

  8. Playing with image rendering

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    7f6a592 View commit details
    Browse the repository at this point in the history

  9. migrated and dropped order table

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    fd33dcf View commit details
    Browse the repository at this point in the history

  10. css bootstrap - show number of cart items next to cart image

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

  11. Merge branch 'master' of https://github.com/lina5147/betsy

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

  12. Merge pull request #26 from lina5147/sem-User-Product-Auth-Tests 

    Sem user product auth tests
    @steve-messing
    steve-messing authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    02e6d3b View commit details
    Browse the repository at this point in the history

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

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

  14. Merge branch 'master' into rms/user_dashboard_pt2

    @r-spiel
    r-spiel authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    867fa7d View commit details
    Browse the repository at this point in the history

  15. Merge pull request #25 from lina5147/rms/user_dashboard_pt2 

    Rms/user dashboard pt2
    @r-spiel
    r-spiel authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    ed32b81 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into kma/purchase_cart

    @agesak
    agesak authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    25ad80d View commit details
    Browse the repository at this point in the history

  17. Merge pull request #23 from lina5147/kma/purchase_cart 

    Kma/purchase cart
    @agesak
    agesak authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    bbba8ef View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' of https://github.com/lina5147/betsy

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

  19. Merge branch 'master' into ld-update_cartitem_price

    @lina5147
    lina5147 authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    3249fb0 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #24 from lina5147/ld-update_cartitem_price 

    Ld update cartitem price
    @lina5147
    lina5147 authored Nov 23, 2020
    Configuration menu
    Copy the full SHA
    b54bcd0 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' of https://github.com/lina5147/betsy

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

  22. Merge branch 'master' of https://github.com/lina5147/betsy

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    2cc9af8 View commit details
    Browse the repository at this point in the history

  23. delete new method from category controller

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    ff1920b View commit details
    Browse the repository at this point in the history

  24. omg lina helped my tests pass

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

  25. created review model

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

  26. created reviews controller

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

  27. added relationships between product and review

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

  28. relate reviews to products migration

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

  29. added create action method for review, product nested route

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

  30. worked on the create method in reviews and added review section to p… 

    …roduct show page
    @lina5147
    lina5147 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    71f3043 View commit details
    Browse the repository at this point in the history

  31. add strong params for review, and added model to form

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

  32. navbar is pretty functional

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    e3538d7 View commit details
    Browse the repository at this point in the history

  33. cart purchase tests passing

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

  34. require 16 character cc number

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

  35. product cards and buttons

    @steve-messing
    steve-messing committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    96e100c View commit details
    Browse the repository at this point in the history

  36. added a new migration tro add name column to review

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

  37. added name to strong params, changed the product view to show the sec… 

    …tion for name on the review form
    @lina5147
    lina5147 committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    6fdd0e0 View commit details
    Browse the repository at this point in the history

  38. category tests, delete redundancies in route

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    d93a393 View commit details
    Browse the repository at this point in the history

  39. added error messages to review to application

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

  40. test updates'

    @r-spiel
    r-spiel committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    e840fab View commit details
    Browse the repository at this point in the history

  41. added a custom message to rating validator

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

  42. added a relations test for review

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

  43. format prices in product show page and order confirmation

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

  44. added relation test for product has a list of reviews

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

Commits on Nov 24, 2020

  1. added validation tests for review

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

  2. purchase date column migration

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

  3. added tests for create action mehod for review

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

  4. tests for user conteroller

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    f89b56d View commit details
    Browse the repository at this point in the history

  5. delete white space

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    649daa4 View commit details
    Browse the repository at this point in the history

  6. cart tests pass with new purchase_datetime column

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

  7. get rid of unnecessary space differences

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

  8. small changes

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    223784c View commit details
    Browse the repository at this point in the history

  9. idk spaces

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

  10. using bootstrap for purchase form

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

  11. delete duplicate info in cart controller purchase method

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    85e7a96 View commit details
    Browse the repository at this point in the history

  12. revert back

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c96c963 View commit details
    Browse the repository at this point in the history

  13. formatting the reviews, adding star images as rating

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

  14. a poorly formatted container for confirmation page

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

  15. category banner images

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    4361184 View commit details
    Browse the repository at this point in the history

  16. a table works omg

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

  17. basic product nav styling complete

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    930da73 View commit details
    Browse the repository at this point in the history

  18. bootstrap styling the customer review section

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

  19. Merge pull request #28 from lina5147/bootstrappin 

    Bootstrappin
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    46d3d8a View commit details
    Browse the repository at this point in the history

  20. save current work

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

  21. format images

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

  22. resolved merge conflict

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

  23. Merge branch 'master' of https://github.com/lina5147/betsy into kma/p… 

    …urchase_cart
    @agesak
    agesak committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5f51675 View commit details
    Browse the repository at this point in the history

  24. schema diff

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

  25. residual merge conflict mess

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

  26. should have deleted

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

  27. styling spacing and font color of reviews section

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

  28. added rating validator, only rating between 1-5, wrote tests

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

  29. update fulfillment methods to only pull user's cartitems from cart

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    d3a2250 View commit details
    Browse the repository at this point in the history

  30. create a method for average rating of product

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

  31. rounded average rating to 1 decimal place

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

  32. fixed avg_rating method to handle no reviews and fixed rounding

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

  33. added tests for avg rating method

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

  34. added rating to the products view page

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

  35. made the costs on the product list and show page to two decimal place… 

    …s, added dollar sign
    @lina5147
    lina5147 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    058a5f5 View commit details
    Browse the repository at this point in the history

  36. added in the show page of a product that the product owner cannot lea… 

    …ve a review
    @lina5147
    lina5147 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    be5d94f View commit details
    Browse the repository at this point in the history

  37. added back some of the cart formatting

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

  38. some changes

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    e827dec View commit details
    Browse the repository at this point in the history

  39. add block items containers

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0a88b17 View commit details
    Browse the repository at this point in the history

  40. added more tests for current cart

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

  41. minor update

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    ccd1c19 View commit details
    Browse the repository at this point in the history

  42. using bootstrap to format form

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

  43. changed the margin for the category label

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

  44. Merge branch 'ld-ka-review' into ld-css-forms

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

  45. more css formating

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

  46. formated new form to be similar to edit form

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

  47. save changes

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

  48. changes validation messages

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

  49. added more tests for the create action in reviews, test flash messages

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

  50. add order details page (cart route/controller method), add some styli… 

    …ng for current user page
    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5e065c9 View commit details
    Browse the repository at this point in the history

  51. Merge branch 'master' into rms/categories_testing

    @r-spiel
    r-spiel authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c711757 View commit details
    Browse the repository at this point in the history

  52. Merge pull request #27 from lina5147/rms/categories_testing 

    Rms/categories testing
    @r-spiel
    r-spiel authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    4ba34c8 View commit details
    Browse the repository at this point in the history

  53. Merge branch 'master' into rms/user_dashboard_cont

    @r-spiel
    r-spiel authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    712dfbf View commit details
    Browse the repository at this point in the history

  54. Merge pull request #32 from lina5147/rms/user_dashboard_cont 

    Rms/user dashboard cont
    @r-spiel
    r-spiel authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    01f0dc8 View commit details
    Browse the repository at this point in the history

  55. Merge pull request #29 from lina5147/kma/purchase_cart 

    Kma/purchase cart
    @agesak
    agesak authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0742149 View commit details
    Browse the repository at this point in the history

  56. Merge branch 'master' into ld-ka-review

    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    310bb18 View commit details
    Browse the repository at this point in the history

  57. Merge pull request #30 from lina5147/ld-ka-review 

    Ld ka review
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    e3cfe4c View commit details
    Browse the repository at this point in the history

  58. Merge pull request #31 from lina5147/ld-test_current_cart 

    added more tests for current cart
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    860bb53 View commit details
    Browse the repository at this point in the history

  59. Merge pull request #33 from lina5147/ld-css-forms 

    Ld css forms
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    e3c69ed View commit details
    Browse the repository at this point in the history

  60. fixed syntax error

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

  61. delete duplicate code in cart controller, skip failing user test

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    135eda7 View commit details
    Browse the repository at this point in the history

  62. changed flash key names for review to be consistant

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

  63. user model tests

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    0396fbc View commit details
    Browse the repository at this point in the history

  64. user controller test added

    @r-spiel
    r-spiel committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    a00c622 View commit details
    Browse the repository at this point in the history

  65. removed unneeded photos and made sure a photo shows up in the cart if… 

    … there is an image available
    @lina5147
    lina5147 committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c5ab8c2 View commit details
    Browse the repository at this point in the history

  66. refactored product error messages

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

  67. improved default image setting

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    a89342b View commit details
    Browse the repository at this point in the history

  68. css style radio buttons, and form rows dont move when filled out

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

  69. default image testing complete

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    572d9ea View commit details
    Browse the repository at this point in the history

  70. made flash bold.

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c09021a View commit details
    Browse the repository at this point in the history

  71. product show page

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    d5df3f1 View commit details
    Browse the repository at this point in the history

  72. match linas styling for purchase form

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

  73. tiny blue Xs in cart

    @steve-messing
    steve-messing committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    2d2583b View commit details
    Browse the repository at this point in the history

  74. move back to cart button

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

  75. spacing

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

  76. more spacing

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

  77. Merge pull request #34 from lina5147/rms/user_testing_updates 

    Rms/user testing updates
    @agesak
    agesak authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    232bfaf View commit details
    Browse the repository at this point in the history

  78. Merge pull request #35 from lina5147/ld-refactor-error-messages 

    Ld refactor error messages
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    c3944e9 View commit details
    Browse the repository at this point in the history

  79. Merge pull request #36 from lina5147/ld-new_and_edit_form_revisit 

    Ld new and edit form revisit
    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    e5ea9a9 View commit details
    Browse the repository at this point in the history

  80. Merge pull request #38 from lina5147/kma/purchase_form 

    Kma/purchase form
    @agesak
    agesak authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    b5c1c06 View commit details
    Browse the repository at this point in the history

  81. Merge branch 'master' into product-frontent

    @lina5147
    lina5147 authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    40032c4 View commit details
    Browse the repository at this point in the history