Merging main into dev – Bringing All Updates Forward #80
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
Added conflict checker action for pull requests
Signed-off-by: Ishaan Gupta <ishaankone@gmail.com>
Add Responsiveness in Login Page, Register Page and profile Page
Signed-off-by: mdxabu <abdullahfakrudeen2020@gmail.com>
This PR introduces a role-based access control (RBAC) mechanism for the app, ensuring that only users with the correct roles (i.e., "admin") are allowed to access certain routes and pages. The changes include the enhancement of the role_required decorator to check the user's role and redirect non-admin users to the 403.html page if they attempt to access admin-specific pages. Additionally, improvements were made to handle cases where the user session might be None, preventing AttributeError exceptions when accessing user data.
Signed-off-by: Ishaan Gupta <ishaankone@gmail.com>
Signed-off-by: Bagwan <bagwanaran@gmail.com>
Signed-off-by: Bagwan <bagwanaran@gmail.com>
- Allow users to drop files anywhere on the page - Maintain existing file input and enhance user experience - Provide visual feedback when dragging files Signed-off-by: Bagwan <bagwanaran@gmail.com>
- Add page-wide drag and drop functionality for file uploads - Integrate file type validation matching existing allowed extensions - Show error message for invalid file types - Maintain existing file input functionality - Add visual feedback during file drag operations Signed-off-by: Bagwan <bagwanaran@gmail.com>
Signed-off-by: Bagwan <bagwanaran@gmail.com>
Add page-wide drag and drop functionality for file uploads
- Database/admindatahandler.py, Database/userdatahandler.py, app.py, requirements.txt, static/css/style.css, templates/admin.html,templates/profile.html - Resolved conflicts and added static/js/dragdrop.js and templates/403.html - Resolved conflicts and removed templates/404.html Signed-off-by: Bagwan <bagwanaran@gmail.com>
- Moved rx=10 and ry=10 from profile.css to profile.html to resolve errors. - Ensured rounded corners are applied correctly without conflicts. Signed-off-by: Bagwan <bagwanaran@gmail.com>
|
@pradeeban |
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.
This PR merges changes from
mainintodev, resolving conflicts and ensuring all features and fixes are integrated smoothly. Once merged, the development branch will be fully synchronised with main, including the latest updates, enhancements, and bug fixes. Thus solving first phase of issue #79rxandryattribute errors inprofile.html.Checklist: