Skip to content

Gamification features (frontend)#1014

Draft
xXPinkmagicXx wants to merge 93 commits intomasterfrom
gamification
Draft

Gamification features (frontend)#1014
xXPinkmagicXx wants to merge 93 commits intomasterfrom
gamification

Conversation

@xXPinkmagicXx
Copy link
Copy Markdown
Member

@xXPinkmagicXx xXPinkmagicXx commented Apr 2, 2026 •
edited
Loading

Gamification of Zeeguu

In this PR we have added the backend for features such as friends, friend streak, badges, friend leaderboard, classroom leaderboard.

In one image we have added:
image

Issues and dicussions

Also see sub issues

Breakdown PRs of features

Gamification feature flag

Friends and Profile

Badges

Leaderboards

xXPinkmagicXx and others added 30 commits February 24, 2026 15:41
@xXPinkmagicXx
Working on badges
c64f1fc
@xXPinkmagicXx
chaned the appConstant for local development
88b93a9
@klnyzzz33
Fixed bug of scroll progress update not being sent out
7e69ed4
@gabortodor
Started implementation for my badges page
be98fff
@gabortodor
Added badge counter notification
1f1308a
@xXPinkmagicXx
Working on friends
04b5119
@xXPinkmagicXx
Working on friends and functionality
a616557
@xXPinkmagicXx
working on frineds feature
194d428
@gabortodor
Tracked badge api changes
97f407a
@gabortodor
Tracked badge api changes
f827769
@klnyzzz33
Reverted appConstant change
134818b
@gabortodor
Tracked badge api changes
4389b77
@gabortodor
Fixed centering in My Activity page
5dca525
@klnyzzz33
Started working on user profile page
f1f8f69
@xXPinkmagicXx
Some changes to ui and now error messages with toaster
471a18c
@xXPinkmagicXx
Merge branch 'gamification' into feature/friendship-system
a1a2f12
@xXPinkmagicXx
Deleted commented out endpoints
b7cd48d
@xXPinkmagicXx
Clean up commented out code
b4f5108
@xXPinkmagicXx
Now with a reset button
5523429
@xXPinkmagicXx
Merge branch 'gamification' into feature/profile
a7f23e5
@xXPinkmagicXx
Working on profile page
705490b
@xXPinkmagicXx
Working on edit username
046940a
@gabortodor
Refactored badge page
f72715d
@gabortodor
Merge branch 'gamification' into feature/badges
02332b0 
# Conflicts:
#	src/AppLayout.js
#	src/MainAppRouter.js
#	src/hooks/useScrollTracking.js
@xXPinkmagicXx
changed back the app constants
b93d0cd
@xXPinkmagicXx
Merge pull request #956 from zeeguu/feature/friendship-system
10af45c 
Feature/friendship system
@gabortodor
Tracked api url changes
b39a199
@gabortodor
Merge branch 'gamification' into feature/badges
5610862 
# Conflicts:
#	src/api/Zeeguu_API.js
@gabortodor
Merge pull request #959 from zeeguu/feature/badges
7c50b81 
Feature/badges
@klnyzzz33
Merge branch 'gamification' into feature/profile
b3ef354
klnyzzz33 and others added 27 commits March 17, 2026 17:06
@klnyzzz33
Fixed small errors during merge
b6ded21
@xXPinkmagicXx
See profile by clicking username
96fb6f4
@klnyzzz33
Small refactoring, and changed avatar customization colors
06537cc
@xXPinkmagicXx
Now the friend requests also have see profile feature.
9ddf27f
@xXPinkmagicXx
FriendRequest Context and notification count
98335bb
@klnyzzz33
Minor css changes and new avatar characters
a5515fd
@gabortodor
Merge branch 'feature/profile' into feature/see-friends-profile
901fcbf
@klnyzzz33
Reverted appConstants.js
77b7dd5
@klnyzzz33
Solved merge conflicts
271cabb
@xXPinkmagicXx
Styled components
f155c67
@xXPinkmagicXx
Now the unfirend button works
2809717
@xXPinkmagicXx
Fixed the search bar colors for dark mode
8393270
@xXPinkmagicXx
Working on the language features
a739141
@xXPinkmagicXx
Merge pull request #972 from zeeguu/feature/see-friends-profile
5978b79 
Feature/see friends profile
@klnyzzz33
Merged new badge and friend request counter notifications
bd37bc2
@xXPinkmagicXx
Merge branch 'master' into gamification
0397742
@klnyzzz33
Small refactoring
f6d8080
@klnyzzz33
Resolving merge conflicts & refactoring UserProfile
9b75f62
@klnyzzz33
Continued UserProfile refactoring, also added the Zeeguu loading anim…
3213259 
…ation
@klnyzzz33
Merge pull request #979 from zeeguu/feature/profile
b33e80b 
Feature/profile
@klnyzzz33
Merge pull request #980 from zeeguu/master
dc9af98 
Change top tabs background from grey to white
@klnyzzz33
Continued UserProfile refactoring
fb8e978
@gabortodor
Merge pull request #981 from zeeguu/feature/profile
65ca3e2 
Continued UserProfile refactoring
@xXPinkmagicXx
Working on gamification feature flag
6f5eebb
@xXPinkmagicXx
Using the gamification feature flag is used for the profile route
948c753
@xXPinkmagicXx
Redirect logic between gamification feature and regular implementation
5ab1096
@klnyzzz33
Merge pull request #1008 from zeeguu/master
63d997c 
Merge changes from master to gamification
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 2, 2026 •
edited
Loading

✅ Deploy Preview for voluble-nougat-015dd1 ready!

Name Link
🔨 Latest commit d5f2ef4
🔍 Latest deploy log https://app.netlify.com/projects/voluble-nougat-015dd1/deploys/69ce7d9219be8b0008ae839f
😎 Deploy Preview https://deploy-preview-1014--voluble-nougat-015dd1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@xXPinkmagicXx @klnyzzz33 @gabortodor