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

Merge master into ui-patching-grading #4

Merged
merged 37 commits into from
Apr 14, 2024
Merged

Merge master into ui-patching-grading #4

merged 37 commits into from
Apr 14, 2024

Commits on Apr 13, 2024

  1. Fix user service token authentication to further check if {uid, email… 

    …} pair in the token after decrypted is a valid pair in database, write unit test to cover 100% service, remove getAllUser GET endpoint cause it is not a good,secured endpoint, add /health for health check
    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    d46a085 View commit details
    Browse the repository at this point in the history

  2. Remove unused API, add swagger documentation

    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    7cde642 View commit details
    Browse the repository at this point in the history

  3. Fix bug after last change that updateUserPassword doesn't work properly

    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3bd1306 View commit details
    Browse the repository at this point in the history

  4. Add back API user/clearCookie since frontend is using it for loggin… 

    …g out user
    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    34a373e View commit details
    Browse the repository at this point in the history

  5. Fix response message of API user/clearCookie and swagger documentation

    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3e505e5 View commit details
    Browse the repository at this point in the history

  6. Fix message

    @hhchinh2002
    hhchinh2002 committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    b6800b8 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Add recommened ESLint rules from Assignment 6 feedback

    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    f1b7007 View commit details
    Browse the repository at this point in the history

  2. Cover 100% testing coverage

    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    5a0da18 View commit details
    Browse the repository at this point in the history

  3. Merge pull request tryyang2001#89 from tryyang2001/tryyang/patch_assi… 

    …gnment_frontend

Patch Assignment Frontend
    @tryyang2001
    tryyang2001 authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    14137ac View commit details
    Browse the repository at this point in the history

  4. create script for setting up the project and create a README for deta… 

    …iled instruction on how to run the project locally
    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    0b6ba64 View commit details
    Browse the repository at this point in the history

  5. Clear original homepage content

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    79197a6 View commit details
    Browse the repository at this point in the history

  6. Add default padding

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    ccae67c View commit details
    Browse the repository at this point in the history

  7. Standardise padding and margin across assignment pages

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    967032d View commit details
    Browse the repository at this point in the history

  8. Add github action manifest files for continuous deployment

    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    ccb13f4 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' of https://github.com/tryyang2001/CS3213-Fronte… 

    …nd-Management-System
    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    61aace3 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into Continuous-Deployment 

    # Conflicts:
#	frontend/src/config.ts
#	frontend/src/helpers/assignment-service/api-wrapper.ts
    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    caafd5b View commit details
    Browse the repository at this point in the history

  11. add more lint rules for grading service and fix linting errors

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    57de008 View commit details
    Browse the repository at this point in the history

  12. move types folder to under src instead of models, add eslint rules

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    fe3a8de View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/tryyang2001/CS3213-Fronte… 

    …nd-Management-System into tryyang/refactor_code_for_assignment_6_feedbacks
    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    1a86c50 View commit details
    Browse the repository at this point in the history

  14. Fix alignment in sidebar

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    756f937 View commit details
    Browse the repository at this point in the history

  15. fix assignment service eslint errors

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    7cc01c6 View commit details
    Browse the repository at this point in the history

  16. include a README for guideline on how to set up the project

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    70c28a6 View commit details
    Browse the repository at this point in the history

  17. fix assignment test errors and update scripts

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    140c5e0 View commit details
    Browse the repository at this point in the history

  18. Fix yarn dev errors

    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    25d4aff View commit details
    Browse the repository at this point in the history

  19. Merge branch 'Continuous-Deployment' into User-Microservice

    @hhchinh2002
    hhchinh2002 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    f12f37e View commit details
    Browse the repository at this point in the history

  20. Merge pull request tryyang2001#90 from tryyang2001/User-Microservice 

    Add swagger documentation for user service, fix user authentication, write unit test for 100% coverage, Add more ESlint rules from A6 feedback
    @hhchinh2002
    hhchinh2002 authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    4579a5e View commit details
    Browse the repository at this point in the history

  21. fix hydration errors by using useEffect with combination of isLoading… 

    … state
    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    1e6e231 View commit details
    Browse the repository at this point in the history

  22. fix conditional useEffect problem

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    fad4e0b View commit details
    Browse the repository at this point in the history

  23. update frontend test due to assignment page rendering changes

    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    800d4f9 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' of https://github.com/tryyang2001/CS3213-Fronte… 

    …nd-Management-System into tryyang/refactor_code_for_assignment_6_feedbacks
    tryyang2001 committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    5b62d49 View commit details
    Browse the repository at this point in the history

  25. Fix lint errors

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    0b56048 View commit details
    Browse the repository at this point in the history

  26. Update frontend test

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    8f70c9b View commit details
    Browse the repository at this point in the history

  27. Merge pull request tryyang2001#99 from tryyang2001/tryyang/refactor_c… 

    …ode_for_assignment_6_feedbacks

Refactor Code (Specifically Assignment Service & Grading Service) for Assignment 6 Mentor Feedbacks
    @tryyang2001
    tryyang2001 authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    873d287 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'ui-patching-general' into merge-1

    @vivienherq
    vivienherq authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    53a6e42 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #3 from vivienherq/merge-1 

    Merge master into ui-patching-general
    @vivienherq
    vivienherq authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    5d2c0d2 View commit details
    Browse the repository at this point in the history

  30. Fix test error

    @vivienherq
    vivienherq committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    9fb64fc View commit details
    Browse the repository at this point in the history

  31. Merge pull request tryyang2001#98 from vivienherq/ui-patching-general 

    Patch frontend UI for general pages and components
    @vivienherq
    vivienherq authored Apr 14, 2024
    Configuration menu
    Copy the full SHA
    87327f3 View commit details
    Browse the repository at this point in the history