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.

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

Harry web buttons #31

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

Commits on Sep 22, 2023

  1. Configuration menu
    Copy the full SHA
    87634ca View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Added SQL and java backend changes for WebAnalytics

    - mysql_query.sql : added interactions table.
    - InteractionsBean.java : created a java object for interactions.
    - WebAnalyticsService.java : create an abstract interface for WebAnalytics.
    - WebAnalyticsServiceImpl.java : created implementation for WebAnalytics. **reduced methods to add/update interaction to just 1 method, addInteraction().**
    
    TODOs
    - CartServiceImpl.java : added TODO comment where a new interaction will be triggered when adding a product to cart.
    - OrderServiceImpl.java : added TODO comment where lowQuantity check and email will be performed.
    Gabriel-Hh committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    4ff4b7d View commit details
    Browse the repository at this point in the history
  2. Update mysql_query.sql

    fixed typo in interacts tables
    Gabriel-Hh committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3b60d69 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Update mysql_query.sql

    I added 2 text books and a laptop
    harryyang77 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    9978e18 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Added VSCode basic setup
    Gabriel-Hh authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    689343b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    928efb1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1 from harryyang77/main

     Text books an a laptop
    Gabriel-Hh authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    0b34338 View commit details
    Browse the repository at this point in the history
  5. Update userHome.jsp

    added 2 buttons
    harryyang77 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    cf6b801 View commit details
    Browse the repository at this point in the history
  6. Update mysql_query.sql

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    52d5a7f View commit details
    Browse the repository at this point in the history
  7. Update ProductBean.java

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    856851a View commit details
    Browse the repository at this point in the history
  8. Update ProductService.java

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    ed51ee5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a72d031 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    44ad63b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    9a847af View commit details
    Browse the repository at this point in the history
  12. Update ProductService.java

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4925914 View commit details
    Browse the repository at this point in the history
  13. Update mysql_query.sql

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    08e1ee9 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    64d4773 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    d7b567a View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    cf8955a View commit details
    Browse the repository at this point in the history
  17. Merge pull request #2 from Gabriel-Hh/YuDev

    Mailer Alert + Name Updates
    Gabriel-Hh authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a35569d View commit details
    Browse the repository at this point in the history
  18. Create saleProduct.jsp

    Pettiii authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4944cc9 View commit details
    Browse the repository at this point in the history
  19. Update adminStock.jsp

    Pettiii authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    27010d8 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    a10d982 View commit details
    Browse the repository at this point in the history
  21. Update ProductService.java

    WenbooSu authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    e7bfec6 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. sale section and addptoduct

    added a sale section for costumer and updates addProduct of admin to change condition and discount
    harryyang77 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    e4b74c9 View commit details
    Browse the repository at this point in the history
  2. book

    Added more books
    harryyang77 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c5e1ae3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4 from Gabriel-Hh/harry_web-buttons

    Harry web buttons
    YuYingLiWen authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    abb05c5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a0b880d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a6a560e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e0d496d View commit details
    Browse the repository at this point in the history
  7. Create leaseSelling.jsp

    Pettiii authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8cf3321 View commit details
    Browse the repository at this point in the history
  8. Update adminViewProduct.jsp

    Pettiii authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    35187dd View commit details
    Browse the repository at this point in the history
  9. Create bestSelling.jsp

    Pettiii authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    7152f69 View commit details
    Browse the repository at this point in the history
  10. Update ProductService.java

    Pettiii authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c3d7f85 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    fb6db01 View commit details
    Browse the repository at this point in the history
  12. Update header.jsp

    Pettiii authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8567ac5 View commit details
    Browse the repository at this point in the history
  13. Textbook category and updateProduct

    added textbook in category header and updated update product to have condition field and discount
    harryyang77 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    b61fae1 View commit details
    Browse the repository at this point in the history
  14. Update CartServiceImpl.java, WebAnalyticsServiceImpl.java

    - adding an item to your cart with the button under the item now works also for analytics.
    - put call to web analytics methods in correct method in CartServiceImpl.java
    - removed all debug modifications
    Gabriel-Hh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    7babc4a View commit details
    Browse the repository at this point in the history
  15. Update header.jsp

    harryyang77 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    ed76c29 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    d0b32e9 View commit details
    Browse the repository at this point in the history
  17. Fixed file naming typo

    YuYingLiWen committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    0f18d14 View commit details
    Browse the repository at this point in the history
  18. Refactored Best/Least Selling code

    Note: HAVING sold <= 1 might return nothing if all product has sold at least twice. In this case we would still have the worst items but now with count at 2, then same case when all items have count 3, etc.
    
    So sort by ASC fixes that issue.
    YuYingLiWen committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    795eb23 View commit details
    Browse the repository at this point in the history
  19. Finalized : Interaction triggers WORKS

    - OrderServiceImpl : added correct call after buying items in cart.
    - Index.jsp: reverted changes used to debug
    Gabriel-Hh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c929641 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    14df8c7 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #7 from Gabriel-Hh/gabriel_frontend-analyitics-tri…

    …ggers
    
    Gabriel frontend analytics triggers, Working finally
    No conflicts with ``main``.
    Gabriel-Hh authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    83e0021 View commit details
    Browse the repository at this point in the history
  22. Update userHome, remove 2 buttons

    - I believe these are only for the admin not the customer.
    - Can be easily reverted if we change our minds.
    Gabriel-Hh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8d8d5ca View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    cbb164c View commit details
    Browse the repository at this point in the history
  24. Merge pull request #6 from Gabriel-Hh/harry_web-buttons

    Harry web buttons
    Gabriel-Hh authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    fd8a890 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Configuration menu
    Copy the full SHA
    6a372da View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0950bf0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d4022d8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1cb9b7c View commit details
    Browse the repository at this point in the history
  5. updateProduct.jsp WORKING

    LFG!
    Gabriel-Hh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    4b471be View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e0e808f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3efdac9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5ce5158 View commit details
    Browse the repository at this point in the history
  9. Update saleProduct.jsp

    Pettiii authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    fa5dbf6 View commit details
    Browse the repository at this point in the history
  10. Minor changes

    harryyang77 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    b0bf828 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2bcced1 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b70da08 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    38c6288 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2210c28 View commit details
    Browse the repository at this point in the history
  15. userHome.jsp IN PROGRESS

    -logic is all there, the new sections are displaying empty lists
    -Once fixed should display correct products in correct sections.
    Gabriel-Hh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    3cd1166 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    bd3d526 View commit details
    Browse the repository at this point in the history
  17. Reverting 2 commits Read desc

    fa5dbf6
    
    5ce5158
    
    Was breaking adminViewProduct.jsp page
    YuYingLiWen committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    3b48f88 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    85fc7a9 View commit details
    Browse the repository at this point in the history
  19. show sale items at home screen

    show sale items at home screen
    harryyang77 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    5b2f7b8 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    ad22fab View commit details
    Browse the repository at this point in the history
  21. userHome.,jsp Working

    - the For You section works, lists 6 items from most interacted categories, items are all 'new'
    - the Student Specials section works, list upto 6 items for the textbook, mobile or tablet categories, if user has interacted with textbook (therefore is student). These products most also be used to appear in this section
    - searching make new sections disapear
    - clicking on a catagory does not, but should, TO FIX in future.
    Gabriel-Hh committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    9a99307 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    e0b9932 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    638970a View commit details
    Browse the repository at this point in the history
  24. made least selling availble to customer

    made least selling availble to customer
    harryyang77 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f84a137 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    4954180 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    83cd848 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    5b2df3a View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    0bbde0f View commit details
    Browse the repository at this point in the history
  29. Update addProduct.jsp

    YuYingLiWen authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    d3c8908 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    1b32673 View commit details
    Browse the repository at this point in the history
  31. Revert "Merge pull request #8 from Gabriel-Hh/harry_web-buttons"

    This reverts commit 1b32673, reversing
    changes made to 638970a.
    YuYingLiWen committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    1cc6d99 View commit details
    Browse the repository at this point in the history
  32. Update addProduct.jsp

    harryyang77 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    a2d5a99 View commit details
    Browse the repository at this point in the history