Feature/gamification social ag2#441
Merged
raphaelman merged 19 commits intoAug 2, 2025
Merged
Conversation
Replaced hardcoded colors and text styles
reverted the back button to createAppBar
implement createAppBar
…social-networking), bug fixes
…and spring.datasource
… and AuthService
raphaelman
approved these changes
Aug 2, 2025
dtruong5
changed the base branch from
care-connect-develop-ag2
to
care-connect-develop-agAug1-fixes
raphaelman
merged commit e5bb9cc
into
care-connect-develop-agAug1-fixes
1 of 2 checks passed
raphaelman
pushed a commit
that referenced
this pull request
Aug 3, 2025
* be changes to support m to m links ai enhancement notification using ws and http and related changes * reverted unintentional security changes * bug fixes and refactoring ag * populatin caregiver and family member ids * web build field and patient status bug * added notifications fixed additional issues in the caregiver dashboard and analytics page and other related changes * reverting file management page dart file changes * build issue * fix to use userid in aichat * Feature/gamification social ag2 (#441) * Bug Fix, Leaderboard Opt In, Daily Motivational Message * Update gamification_screen.dart Replaced hardcoded colors and text styles * Update friend_requests_screen.dart reverted the back button to createAppBar * Update search_user_screen.dart implement createAppBar * update user to fix my branch after merge * Updated User.java to match care-connect-develop-ag2 branch * brought the changes from care-connect-develop to ag2 (gamification + social-networking), bug fixes * Update application.properties from local setup back to original * Safely update login streak and last login date with null checks * Add login streak tracking and leaderboard opt-in logic to User model and AuthService * clean up User entity with required fields * removed Billing module * Update: FeedController, LeaderboardEntry * Messaging & FeedController integration updates --------- Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> * Fix file upload (#442) Fix file upload in file management * simplify create post to support JSON-only without image upload (#443) * Bug Fix, Leaderboard Opt In, Daily Motivational Message * Update gamification_screen.dart Replaced hardcoded colors and text styles * Update friend_requests_screen.dart reverted the back button to createAppBar * Update search_user_screen.dart implement createAppBar * update user to fix my branch after merge * Updated User.java to match care-connect-develop-ag2 branch * brought the changes from care-connect-develop to ag2 (gamification + social-networking), bug fixes * Update application.properties from local setup back to original * Safely update login streak and last login date with null checks * Add login streak tracking and leaderboard opt-in logic to User model and AuthService * clean up User entity with required fields * removed Billing module * Update: FeedController, LeaderboardEntry * Messaging & FeedController integration updates * Removed image upload logic from FeedController#createPost --------- Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> * email switch to spring service * dashborad responsiveness fix * ai chat fix * Revert "email switch to spring service" This reverts commit 025fc8c. * reverted the responsiveness change removed pii from ai and added meta data about the application scales * add commondrawer to patient status page. remove constraint maxwidth from container in status page. add missing default width to desktop case in responsive_utils fix task widget day picker width * Update patient_status_page.dart fix app bar title * cc- denpendency fix --------- Co-authored-by: dtruong5 <87693856+dtruong5@users.noreply.github.com> Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> Co-authored-by: Alyssa Marielle Harding <44278215+alyssaraq98@users.noreply.github.com> Co-authored-by: Alex <vecch@live.com> Co-authored-by: eraphael <eraphael3@student.umgc.edu>
raphaelman
added a commit
that referenced
this pull request
Aug 3, 2025
* be changes to support m to m links ai enhancement notification using ws and http and related changes * reverted unintentional security changes * bug fixes and refactoring ag * populatin caregiver and family member ids * web build field and patient status bug * added notifications fixed additional issues in the caregiver dashboard and analytics page and other related changes * reverting file management page dart file changes * build issue * fix to use userid in aichat * Feature/gamification social ag2 (#441) * Bug Fix, Leaderboard Opt In, Daily Motivational Message * Update gamification_screen.dart Replaced hardcoded colors and text styles * Update friend_requests_screen.dart reverted the back button to createAppBar * Update search_user_screen.dart implement createAppBar * update user to fix my branch after merge * Updated User.java to match care-connect-develop-ag2 branch * brought the changes from care-connect-develop to ag2 (gamification + social-networking), bug fixes * Update application.properties from local setup back to original * Safely update login streak and last login date with null checks * Add login streak tracking and leaderboard opt-in logic to User model and AuthService * clean up User entity with required fields * removed Billing module * Update: FeedController, LeaderboardEntry * Messaging & FeedController integration updates --------- Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> * Fix file upload (#442) Fix file upload in file management * simplify create post to support JSON-only without image upload (#443) * Bug Fix, Leaderboard Opt In, Daily Motivational Message * Update gamification_screen.dart Replaced hardcoded colors and text styles * Update friend_requests_screen.dart reverted the back button to createAppBar * Update search_user_screen.dart implement createAppBar * update user to fix my branch after merge * Updated User.java to match care-connect-develop-ag2 branch * brought the changes from care-connect-develop to ag2 (gamification + social-networking), bug fixes * Update application.properties from local setup back to original * Safely update login streak and last login date with null checks * Add login streak tracking and leaderboard opt-in logic to User model and AuthService * clean up User entity with required fields * removed Billing module * Update: FeedController, LeaderboardEntry * Messaging & FeedController integration updates * Removed image upload logic from FeedController#createPost --------- Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> * email switch to spring service * dashborad responsiveness fix * ai chat fix * Revert "email switch to spring service" This reverts commit 025fc8c. * reverted the responsiveness change removed pii from ai and added meta data about the application scales * caregiver dashborad responsiveness and analytics page data display issues --------- Co-authored-by: Ashenafi-Tesfaye <65870089+Ashenafi-Tesfaye@users.noreply.github.com> Co-authored-by: dtruong5 <87693856+dtruong5@users.noreply.github.com> Co-authored-by: Dat Truong <dtruong5@student.umgc.edu> Co-authored-by: Alyssa Marielle Harding <44278215+alyssaraq98@users.noreply.github.com> Co-authored-by: eraphael <eraphael3@student.umgc.edu>
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
2 participants
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.
Re-added messaging functionality:
MessageController.java
InboxMessageDto.java
Message.java
MessageRepository.java
Updated CommentController to align with new API structure and consistency.
Resolved merge conflict in FeedController.java by restoring post creation response with PostWithCommentCountDto.