-
Notifications
You must be signed in to change notification settings - Fork 0
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
Catkins dev #57
Open
MarioLiao
wants to merge
158
commits into
main
Choose a base branch
from
catkins_dev
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
Catkins dev #57
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
Updated repository structure so that we can use the same setup throughout the sprints Updated Club Schema to include owner, clubTags and list of members. Updated User schema to include password and user role
Feed post retrieval in newest first order (/feed)
Feed post retrieval in newest first order (/feed)
Merge pull request #7 from UTSCCSCC01/User-Story-1.2
Update Branch to match changes
commit 389a56e Merge: 1594fb6 537169a Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:43:10 2022 -0400 Merge pull request #4 from UTSCCSCC01/Develop Develop commit 537169a Merge: a84b9c2 a42fd4b Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:41:58 2022 -0400 Merge pull request #3 from UTSCCSCC01/zeneo's-branch Zeneo's branch commit a42fd4b Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:40:57 2022 -0400 Verify club search when posting commit 6529981 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Fri Sep 30 20:16:55 2022 -0400 Created post schema in database and basic post functions
commit 93d0d71 Merge: 389a56e 8dd0845 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 18:37:12 2022 -0400 Merge pull request #7 from UTSCCSCC01/User-Story-1.2 Feed post retrieval in newest first order (/feed) commit 8dd0845 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 18:35:19 2022 -0400 Feed post retrieval in newest first order (/feed) commit 389a56e Merge: 1594fb6 537169a Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:43:10 2022 -0400 Merge pull request #4 from UTSCCSCC01/Develop Develop commit 537169a Merge: a84b9c2 a42fd4b Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:41:58 2022 -0400 Merge pull request #3 from UTSCCSCC01/zeneo's-branch Zeneo's branch commit a42fd4b Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 17:40:57 2022 -0400 Verify club search when posting commit 6529981 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Fri Sep 30 20:16:55 2022 -0400 Created post schema in database and basic post functions
commit 93d0d71 Merge: 389a56e 8dd0845 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 18:37:12 2022 -0400 Merge pull request #7 from UTSCCSCC01/User-Story-1.2 Feed post retrieval in newest first order (/feed) commit 8dd0845 Author: Zeneos <95008961+Zeneos@users.noreply.github.com> Date: Mon Oct 3 18:35:19 2022 -0400 Feed post retrieval in newest first order (/feed)
…unfollow clubs and it be updated to the database
CAT 49 - Added a follow and unfollow button allowing users to follow/…
-Added the ability to user to retrieve posts -Changed the UI of the Navbars
Updated frontend with simple form to test backend submission And added a mock links to redirect instead of a navbar for tests as well
Updated the create club component to fix functions to create a club. - URL was directing to PORT 3000 - HandleChange function was wrong - Renamed name to clubName to be more intuitive
…ee posts made from groups they follow
CAT-9-US-8 - completed the filtering of feed so that users can only s…
- Changed /clubs/testClub to pull from /feed instead of /posts to better implement backend functions - Added basic documentation for models and routes for backend code (feel free to update with more extensive documentation)
- Actual documentation content
- Implemented delete user by id function in users.js to better match other models - Added documentation for user delete function
- Implemented function to query users by username to assist in
…t, record keeping) - Implemented function to query users by username to assist in group join functions - Implemented function to delete users from database by id (convenience) - Documentation for both functions
CAT-4/US-3 --- Implemented user functions
- Implemented public field (bool) in posts schema determining if a post is for everyone or those in the group only - Implemented feed sorting where feed now checks if posts are public before displaying - Implemented feed sorting where feed checks if a user is following a group and displays private posts from said group - Documentation updated
CAT-2/US-1 --- Public/Private group posts feed sorting
- Fixed an issue where mongoDBstore connection would crash
Us 25 login
- Added registration function to /api - Updated documentation
US-26-Registration function
Added field to add executives to the club schema + Added route to add executive + Added field in Club Page so that the owner can add an executive
Allowed executives to post under their club
Created route to check if current user is an executive + conditional to allow current user to post under that club page if they are part of the executives
Merging developer with US-6
Merge pull request #60 from UTSCCSCC01/catkins_dev
Us 22 frontend of club page
Merge had some errors, so i fixed then
Merge pull request #61 from UTSCCSCC01/US-6-Add-VP-team-to-Club-Page
Us 6 add vp team to club page
Catkins dev
-refactored App.js, so that now it conditionally renders register page called LoginComponent.js or whole other app components done before (navbar, feed etc). -created store/index.js file, where I created a Redux component with isLoggedIn, userName state fields and which is persisted on reloading with the help of redux-persist library -created LoginComponent.js, which either displays that user's input is wrong, or creates a new account and logs in a user into newly created account
…able-to-register-an-account.-Frontend-part -US-26 created Register page + added Redux states related to it
…tons. Add images for logo. Add psd files for logo designs.
Catkins dev
-Added mode state to LoginComponent.js, so that a user can switch between options to login or register -Added login handler on the main form of the LoginComponent.js, so now the login functionality works
…able-to-login-with-my-account.-Frontend-part US-25 created Login option in LoginComponent.js
Catkins dev
Us 27 session refactoring
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.