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

Pantry refactor #123

Merged
merged 102 commits into from
Sep 24, 2023
Merged

Pantry refactor #123

merged 102 commits into from
Sep 24, 2023

Commits on Sep 7, 2023

  1. Merge pull request #117 from COS301-SE-2023/PantryRefactor 

    Pantry refactor
    @SkulderLock
    SkulderLock authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    334a2d4 View commit details
    Browse the repository at this point in the history

  2. 🚧 Adding barcode scanner

    @SkulderLock
    SkulderLock committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    ef99e5c View commit details
    Browse the repository at this point in the history

  3. ✨ Frontend barcode functionality

    @SkulderLock
    SkulderLock committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    6c81c19 View commit details
    Browse the repository at this point in the history

  4. 🐛 Bug fix and Barcode frontend components

    @SkulderLock
    SkulderLock committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a409bcc View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. ✨ Added Dynamic collections for products

    @SkulderLock
    SkulderLock committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    3a88027 View commit details
    Browse the repository at this point in the history

  2. 🚧 Added methods to choose store

    @SkulderLock
    SkulderLock committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    ecbea60 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. 🚧 Webscraper code added

    @SkulderLock
    SkulderLock committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    5379238 View commit details
    Browse the repository at this point in the history

  2. 🚧 Get sitemap links Checkers

    @SkulderLock
    SkulderLock committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    292f8dd View commit details
    Browse the repository at this point in the history

  3. 🚧 Logic to process links

    @SkulderLock
    SkulderLock committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    69b7cfc View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. 🚧 Method to handle category links

    @SkulderLock
    SkulderLock committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    0930af5 View commit details
    Browse the repository at this point in the history

  2. 🚧

    @SkulderLock
    SkulderLock committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    294fd6b View commit details
    Browse the repository at this point in the history

  3. 🚧 Method to handle product link

    @SkulderLock
    SkulderLock committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    b433ecc View commit details
    Browse the repository at this point in the history

  4. ♻️ Change to use constructors instead of autowired

    @SkulderLock
    SkulderLock committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    3a0741f View commit details
    Browse the repository at this point in the history

  5. 🚧 Scraping scheduling

    @SkulderLock
    SkulderLock committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    9418dfd View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. 🗃️ Added index

    @SkulderLock
    SkulderLock committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    74fc509 View commit details
    Browse the repository at this point in the history

  2. 🐛 small fixes and extended timeout duration

    @SkulderLock
    SkulderLock committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    8512585 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. ✨ Checkers Scraper + logs

    @SkulderLock
    SkulderLock committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    90d8a6b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. ✨ Price shown in modal

    @SkulderLock
    SkulderLock committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    7c22dba View commit details
    Browse the repository at this point in the history

  2. ✨ Total Price showing on shopping list

    @SkulderLock
    SkulderLock committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    13177e2 View commit details
    Browse the repository at this point in the history

  3. 🐛 bug fixes

    @SkulderLock
    SkulderLock committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    96eb0c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2023

  1. ➖ remove confilicting dependencies

    @SkulderLock
    SkulderLock committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    7eab97f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Update home.page.ts

    @theodorleroux
    theodorleroux committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    ee491a8 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. images fixed

    @theodorleroux
    theodorleroux committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    f64233c View commit details
    Browse the repository at this point in the history

  2. more css fixed

    @theodorleroux
    theodorleroux committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    38fec0f View commit details
    Browse the repository at this point in the history

  3. Create HydrationService.java

    @theodorleroux
    theodorleroux committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    7b0d431 View commit details
    Browse the repository at this point in the history

  4. Create TriggerService.java

    @theodorleroux
    theodorleroux committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    5f156c2 View commit details
    Browse the repository at this point in the history

  5. Create RecommendationService.java

    @theodorleroux
    theodorleroux committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    225c5ee View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Update daily-meals.component.scss

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    f46224a View commit details
    Browse the repository at this point in the history

  2. Create LogEntryModel.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    affd637 View commit details
    Browse the repository at this point in the history

  3. Update RecommendationService.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    b33082f View commit details
    Browse the repository at this point in the history

  4. Relationship over new nodes

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    df3bb9a View commit details
    Browse the repository at this point in the history

  5. Update HasLogEntry.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    18615f6 View commit details
    Browse the repository at this point in the history

  6. added relationships to user

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    bd64707 View commit details
    Browse the repository at this point in the history

  7. removed empty constructor

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8e14a74 View commit details
    Browse the repository at this point in the history

  8. mb gang

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    f5c9872 View commit details
    Browse the repository at this point in the history

  9. Update MealManagementController.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a449e08 View commit details
    Browse the repository at this point in the history

  10. Create LogService.java 

    LogService to handle creating storing and retrieving of entries
    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a72c55e View commit details
    Browse the repository at this point in the history

  11. added findbymealNameFor logservice

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    ffac33e View commit details
    Browse the repository at this point in the history

  12. logging of meals added

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    be387d6 View commit details
    Browse the repository at this point in the history

  13. regen logged

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    bd5d27c View commit details
    Browse the repository at this point in the history

  14. Logging Functional

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    9d10ca9 View commit details
    Browse the repository at this point in the history

  15. cleanup

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    173c8ac View commit details
    Browse the repository at this point in the history

  16. poll user list and set if processed.

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    9a3b7e2 View commit details
    Browse the repository at this point in the history

  17. Tweaked poll rate

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    19771b3 View commit details
    Browse the repository at this point in the history

  18. Create ViewModel.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8d1c23e View commit details
    Browse the repository at this point in the history

  19. moved to correct folder

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    55eb4ff View commit details
    Browse the repository at this point in the history

  20. updated models to support view

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    7b4b5d9 View commit details
    Browse the repository at this point in the history

  21. ensure hashmap exists

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    84eb71c View commit details
    Browse the repository at this point in the history

  22. added ability to find a users unprocessed log entries

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    7f688fe View commit details
    Browse the repository at this point in the history

  23. update view model and efficient processing

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fa0bedf View commit details
    Browse the repository at this point in the history

  24. data procesing and normalisation for hashmap

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    79c8ba9 View commit details
    Browse the repository at this point in the history

  25. cleanup

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    79739c0 View commit details
    Browse the repository at this point in the history

  26. flesh out hydration system, i take break now

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    4d403de View commit details
    Browse the repository at this point in the history

  27. View Creation

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8a72332 View commit details
    Browse the repository at this point in the history

  28. Delete TriggerService.java

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    c6a3c3a View commit details
    Browse the repository at this point in the history

  29. done for the day i cant think

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    aeaefec View commit details
    Browse the repository at this point in the history

  30. i lied, save request mapped, now im done

    @theodorleroux
    theodorleroux committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fd32144 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. fixed build error

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    ddcfba9 View commit details
    Browse the repository at this point in the history

  2. score tweaks

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    9a2f03d View commit details
    Browse the repository at this point in the history

  3. enabled scheduliung and lowered polling rate

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    e8e27ad View commit details
    Browse the repository at this point in the history

  4. many fixes

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    6da0b3d View commit details
    Browse the repository at this point in the history

  5. working now, lottta fixes

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    0286084 View commit details
    Browse the repository at this point in the history

  6. Update HydrationService.java

    @theodorleroux
    theodorleroux committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    f8396c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. ✨ New exception handler

    @SkulderLock
    SkulderLock committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    d1bf894 View commit details
    Browse the repository at this point in the history

  2. actually fixed now

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    c7e05b2 View commit details
    Browse the repository at this point in the history

  3. value tweaks

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    10d979f View commit details
    Browse the repository at this point in the history

  4. mapped out recommendation

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    a79b84b View commit details
    Browse the repository at this point in the history

  5. function to get certain values added

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    60527bb View commit details
    Browse the repository at this point in the history

  6. Update ViewModel.java

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    0e6d09e View commit details
    Browse the repository at this point in the history

  7. pantry list function

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    0b7463a View commit details
    Browse the repository at this point in the history

  8. ✨ qol changes

    @SkulderLock
    SkulderLock committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    b473f54 View commit details
    Browse the repository at this point in the history

  9. Common items Function added

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    7762403 View commit details
    Browse the repository at this point in the history

  10. Update RecommendationService.java

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    378339a View commit details
    Browse the repository at this point in the history

  11. ingredient testing on regen

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    fad123f View commit details
    Browse the repository at this point in the history

  12. Forgot @servvice smh

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    1b55836 View commit details
    Browse the repository at this point in the history

  13. add meal passing for mealgenerationservice

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    9001bb1 View commit details
    Browse the repository at this point in the history

  14. generateFromIngredients added

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    05b7fa0 View commit details
    Browse the repository at this point in the history

  15. Added overloaded Functions to include Liked Ingredeints

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    cbf9584 View commit details
    Browse the repository at this point in the history

  16. gpt now gets queried with liked meals, not tested

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    1430eaf View commit details
    Browse the repository at this point in the history

  17. forgot to change

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    34ac446 View commit details
    Browse the repository at this point in the history

  18. all implemented except for checking the database for valid meals

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    3810575 View commit details
    Browse the repository at this point in the history

  19. to lower case trim to ensure less duplicates

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    82b966a View commit details
    Browse the repository at this point in the history

  20. to lower case for comparisons

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    6e86bba View commit details
    Browse the repository at this point in the history

  21. better trimming

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    fc0cfcd View commit details
    Browse the repository at this point in the history

  22. cleanup and better regex matching

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    95e7a38 View commit details
    Browse the repository at this point in the history

  23. cleanup and trimming whitespace on list creation

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    92fa9d6 View commit details
    Browse the repository at this point in the history

  24. cleanup

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    59171e6 View commit details
    Browse the repository at this point in the history

  25. added function and variable to find a meal in the database the user c… 

    …an make, and will hopefully like
    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    909a7ed View commit details
    Browse the repository at this point in the history

  26. done, time for testing

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    908d597 View commit details
    Browse the repository at this point in the history

  27. fixed some dumb logic error of mine

    @theodorleroux
    theodorleroux committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    4c8db1a View commit details
    Browse the repository at this point in the history

  28. 🐛 minor change

    @SkulderLock
    SkulderLock committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    8678128 View commit details
    Browse the repository at this point in the history

  29. 🍱 App Icon

    @SkulderLock
    SkulderLock committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    50eca20 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. Optimise view model

    @theodorleroux
    theodorleroux committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    53c2f3a View commit details
    Browse the repository at this point in the history

  2. cleanup

    @theodorleroux
    theodorleroux committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    2963c84 View commit details
    Browse the repository at this point in the history

  3. last tweak for the day

    @theodorleroux
    theodorleroux committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    7517c03 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #126 from COS301-SE-2023/hydration-system-PantryRe… 

    …factor-origin

Hydration system - and User recommendation, rec still untested
    @SkulderLock
    SkulderLock authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    241288f View commit details
    Browse the repository at this point in the history

  5. 🐛 fix for building

    @SkulderLock
    SkulderLock committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    9f9ce1d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'PantryRefactor' into Web-Scraper

    @SkulderLock
    SkulderLock authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    ddeb485 View commit details
    Browse the repository at this point in the history

  7. 🐛 merge conflict fix

    @SkulderLock
    SkulderLock committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    94568d8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #127 from COS301-SE-2023/Web-Scraper 

    Web scraper
    @SkulderLock
    SkulderLock authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    3310357 View commit details
    Browse the repository at this point in the history

  9. ✅ update tests

    @SkulderLock
    SkulderLock committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    ae0182a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'development' into PantryRefactor

    @SkulderLock
    SkulderLock authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    afda8ea View commit details
    Browse the repository at this point in the history