-
Notifications
You must be signed in to change notification settings - Fork 8
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
Student Connect - SHA-1 Team #21
Open
hariclerry
wants to merge
192
commits into
umur:main
Choose a base branch
from
hariclerry:develop
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
adding column names and entity validation
entity-edit
Feature/events crud
Feedback and Feedback Category CRUD completed.
* feat/SHA-1: add jswonwebtoken, springdoc and spring secuity to project dependencies * feat/SHA-1: add TestUserDetailsService * feat/SHA-1: add SecurityConfig * feat/SHA-1: update application.properties to application.yml * feat/SHA-1: add JwtTokenResponse * feat/SHA-1: add AuthRequest * feat/SHA-1: add modelMapper to project dependency * feat/SHA-1: add UserErrorMessages * feat/SHA-1: add and implement UserService * feat/SHA-1: add JwtTokenUtil * feat/SHA-1: add UserRepository * feat/SHA-1: add exceptions * feat/SHA-1: add MapperConfig * feat/SHA-1: add GlobalExceptionHandler * feat/SHA-1: add SecurityConfig * refactor/SHA-1: remove JwtTokenResponse to security package * feat/SHA-1: add exceptions in security * feat/SHA-1: add and implement AuthService * feat/SHA-1: add AuthExceptionHandler * refactor/SHA-1: update contract mappings * refactor/SHA-1: update contract mappings * fix/SHA-1: add DiscriminatorColumn for Student and Admin in Admin, Student, and User * feat/SHA-1: add JwtTokenFilter * feat/SHA-1: add ApplicationUserDetailsService * feat/SHA-1: update authorized apis * feat/SHA-1: add AuthController * refactor/SHA-1: format sql scripts * refactor/SHA-1: update data.sql for admin user
Initial setup for discussion
# Conflicts: # pom.xml # src/main/java/com/waa/project/config/ModelMapperConfig.java
Update discussion and handling modal box and API changes
updated for the comment chaining response and UI implemented
Comment edition implement, search function and UI Implement
implement sub-comments parts for the UI
MERGE: MERGE Feat/dashboard setup INTO develop
# Conflicts: # frontend/package-lock.json # frontend/package.json
* discussion ui discussion front-end ui * merge develop update merge with develop * Update discussion part Update discussion and handling modal box and API changes * updated for the comment updated for the comment chaining response and UI implemented * Comment edition and fix issue Comment edition implement, search function and UI Implement * Sub-comment fetch implement sub-comments parts for the UI * update and merge
Merge INTO develop: Updated the link and added NavBar to all pages
# Conflicts: # frontend/src/features/dashboard/dashboard-student.jsx
Bugfix/code merge
* add frontend implementation of admins crud events * chore: removed .idea/ * remove edit form * fix api request * add events implementation for students * improve ui, add search and refactor * fix events dummy data
* add frontend implementation of admins crud events * chore: removed .idea/ * remove edit form * fix api request * add events implementation for students * improve ui, add search and refactor * fix events dummy data * refactor navbar display * add logout functionality * fix student dsahboard * move events folder to features * fix acedemic resource links
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.