Merging User Side Frontend and Backend wit#12
Merged
Conversation
…r inventory/dashboard page
…d, remove, unfriend, mutual friend check + friend request - accept, decline, cancel
…eld mock data in in UserInventoryTable
…odal by clicking behind modal
… clicking behind modal
…ctionality to close modal by clicking behind modal
… permission classes tuple for user_profile views
Updated models.py to avoid potential conflicting names
…om 'add' to 'search'
…d friend requests recieved modals
…ancel, decline, and accept friend requests
…tions owned by user, and ability to switch to organization view
…organisation view for organization
…s of user, and name (Note, these need to be updated)
… profile view of selected user
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Change Summary
Most user front end and back end for friends, alongside several parts of user inventory and user groups implemented. A merge was made on user_dashboard with use_uv (main) after organization_dashboard merge was made, to resolve conflicts, and some small changes to attempt linking some of organization_dashboard and user_dashboard on the front end was made. Backend connecting organisation and user still possibly incomplete
Other Information
Several Parts of User side page has incorrect variables/api calls and links that still work as temporary placeholders for correct variables/api calls. Mostly to do with using current auth user as subject for profiles/pages where a unique page/profile for non current auth user should be subject, in particular, for the file user_profile_page.