Merge master into integrate-grading-service-3 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cessing certain page, implement token authentication on user service
…in, also fixing some issues on user-service
…, intergrate userpage to allow user to change their passwrod
# Conflicts: # frontend/src/app/login/page.tsx # frontend/src/app/user/page.tsx # frontend/src/components/common/Providers.tsx # frontend/src/components/common/SideBar.tsx # frontend/src/contexts/user-context.tsx # frontend/src/helpers/user-service/api-wrapper.ts # frontend/src/types/user-service.d.ts
# Conflicts: # frontend/src/app/assignments/[id]/page.tsx # frontend/src/app/dashboard/page.tsx # frontend/src/app/login/page.tsx # frontend/src/components/assignment/create/AssignmentEditor.tsx # frontend/src/helpers/user-service/api-wrapper.ts
…button end the bottom, update UserDropdown log out button event handler
…nd also fix the wrong expectation of response for getAssignmentsByUserId
…ues_and_get_assignments_bug Fix Assignment Table Wrong Attribute Types and getAssignments bug
# Conflicts: # backend/user-service/package.json
…message handling.
User microservice intergration with Frontend (2), Frontend components(Sidebar) update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.