Skip to content

Gamification features (draft) #1014

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.

Sign up for GitHub

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

Draft
xXPinkmagicXx wants to merge 94 commits into
base: master
Choose a base branch
from
Draft

Gamification features (draft) #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
c64f1fc
Working on badges
xXPinkmagicXx Feb 24, 2026
88b93a9
chaned the appConstant for local development
xXPinkmagicXx Feb 24, 2026
7e69ed4
Fixed bug of scroll progress update not being sent out
klnyzzz33 Feb 27, 2026
be98fff
Started implementation for my badges page
gabortodor Mar 1, 2026
1f1308a
Added badge counter notification
gabortodor Mar 2, 2026
04b5119
Working on friends
xXPinkmagicXx Mar 3, 2026
a616557
Working on friends and functionality
xXPinkmagicXx Mar 3, 2026
194d428
working on frineds feature
xXPinkmagicXx Mar 3, 2026
97f407a
Tracked badge api changes
gabortodor Mar 3, 2026
f827769
Tracked badge api changes
gabortodor Mar 4, 2026
134818b
Reverted appConstant change
klnyzzz33 Mar 5, 2026
4389b77
Tracked badge api changes
gabortodor Mar 7, 2026
5dca525
Fixed centering in My Activity page
gabortodor Mar 7, 2026
f1f8f69
Started working on user profile page
klnyzzz33 Mar 8, 2026
471a18c
Some changes to ui and now error messages with toaster
xXPinkmagicXx Mar 10, 2026
a1a2f12
Merge branch 'gamification' into feature/friendship-system
xXPinkmagicXx Mar 10, 2026
b7cd48d
Deleted commented out endpoints
xXPinkmagicXx Mar 10, 2026
b4f5108
Clean up commented out code
xXPinkmagicXx Mar 10, 2026
5523429
Now with a reset button
xXPinkmagicXx Mar 10, 2026
a7f23e5
Merge branch 'gamification' into feature/profile
xXPinkmagicXx Mar 11, 2026
705490b
Working on profile page
xXPinkmagicXx Mar 11, 2026
046940a
Working on edit username
xXPinkmagicXx Mar 11, 2026
f72715d
Refactored badge page
gabortodor Mar 11, 2026
02332b0
Merge branch 'gamification' into feature/badges
gabortodor Mar 11, 2026
b93d0cd
changed back the app constants
xXPinkmagicXx Mar 11, 2026
10af45c
Merge pull request #956 from zeeguu/feature/friendship-system
xXPinkmagicXx Mar 11, 2026
b39a199
Tracked api url changes
gabortodor Mar 11, 2026
5610862
Merge branch 'gamification' into feature/badges
gabortodor Mar 11, 2026
7c50b81
Merge pull request #959 from zeeguu/feature/badges
gabortodor Mar 11, 2026
b3ef354
Merge branch 'gamification' into feature/profile
klnyzzz33 Mar 12, 2026
db24dc3
Working on profile page
klnyzzz33 Mar 12, 2026
5ab3697
created the friends tab content component
xXPinkmagicXx Mar 12, 2026
47e2ff9
Working on the friends tab
xXPinkmagicXx Mar 12, 2026
da28da5
Now the accept and reject has icons
xXPinkmagicXx Mar 12, 2026
160a0e5
Working on profile page
klnyzzz33 Mar 12, 2026
3303991
friend row
xXPinkmagicXx Mar 12, 2026
cb46b7e
Moved Icon logic into FriendRow
xXPinkmagicXx Mar 12, 2026
b8be6e7
Active languages overflow bubble now shows all active languages with …
klnyzzz33 Mar 12, 2026
f53413d
ConfirmUnfriendModal
xXPinkmagicXx Mar 12, 2026
c8eb8f7
Working on searching
xXPinkmagicXx Mar 12, 2026
7320547
Only show friend streak when you are friends
xXPinkmagicXx Mar 12, 2026
8d9b1d0
Now with styled components
xXPinkmagicXx Mar 12, 2026
dfc5c00
Check icon for accepted friend request
xXPinkmagicXx Mar 12, 2026
61a130b
Revet local development change
xXPinkmagicXx Mar 12, 2026
f70628a
Added avatar customization on the user profile
klnyzzz33 Mar 13, 2026
49d989b
Started modifying user profile edit page
klnyzzz33 Mar 13, 2026
a35aa2c
Added badges to Profile page and started profile sidebar option
gabortodor Mar 13, 2026
8b4c964
Added user avatar saving
gabortodor Mar 14, 2026
9ee2dca
Merge branch 'master' into gamification
gabortodor Mar 14, 2026
780e1c8
Merge branch 'gamification' into feature/profile
gabortodor Mar 14, 2026
6fff5ff
Edit profile details fix
klnyzzz33 Mar 14, 2026
d7ebfb8
Added dark mode support for profile page
gabortodor Mar 14, 2026
58dadf5
Merge remote-tracking branch 'origin/feature/profile' into feature/pr…
gabortodor Mar 14, 2026
fb3b22f
Refactored avatar selection logic
klnyzzz33 Mar 14, 2026
6f222e3
Fixed "@" imports
gabortodor Mar 14, 2026
7622962
UserDetails now gets updated correctly after profile save
klnyzzz33 Mar 14, 2026
b28e77e
Fixed avatar sidebar icon
gabortodor Mar 15, 2026
93a1ffe
Merge remote-tracking branch 'origin/feature/profile' into feature/pr…
gabortodor Mar 15, 2026
daa5f33
Switch username and name in the FriendRow
xXPinkmagicXx Mar 17, 2026
6ce7173
Merge branch 'feature/profile' into feature/profile-friends
xXPinkmagicXx Mar 17, 2026
01d1487
Merge pull request #962 from zeeguu/feature/profile-friends
xXPinkmagicXx Mar 17, 2026
2056a71
Now with the see friend user profile option
xXPinkmagicXx Mar 17, 2026
81433eb
Now seeing the friend profile page
xXPinkmagicXx Mar 17, 2026
66a9e8d
Working on see friend / user (not friend ) profile
xXPinkmagicXx Mar 17, 2026
b6ded21
Fixed small errors during merge
klnyzzz33 Mar 17, 2026
96fb6f4
See profile by clicking username
xXPinkmagicXx Mar 17, 2026
06537cc
Small refactoring, and changed avatar customization colors
klnyzzz33 Mar 17, 2026
9ddf27f
Now the friend requests also have see profile feature.
xXPinkmagicXx Mar 17, 2026
98335bb
FriendRequest Context and notification count
xXPinkmagicXx Mar 17, 2026
a5515fd
Minor css changes and new avatar characters
klnyzzz33 Mar 17, 2026
901fcbf
Merge branch 'feature/profile' into feature/see-friends-profile
gabortodor Mar 18, 2026
77b7dd5
Reverted appConstants.js
klnyzzz33 Mar 18, 2026
271cabb
Solved merge conflicts
klnyzzz33 Mar 18, 2026
f155c67
Styled components
xXPinkmagicXx Mar 18, 2026
2809717
Now the unfirend button works
xXPinkmagicXx Mar 18, 2026
8393270
Fixed the search bar colors for dark mode
xXPinkmagicXx Mar 18, 2026
a739141
Working on the language features
xXPinkmagicXx Mar 18, 2026
5978b79
Merge pull request #972 from zeeguu/feature/see-friends-profile
xXPinkmagicXx Mar 19, 2026
bd37bc2
Merged new badge and friend request counter notifications
klnyzzz33 Mar 19, 2026
0397742
Merge branch 'master' into gamification
xXPinkmagicXx Mar 19, 2026
f6d8080
Small refactoring
klnyzzz33 Mar 19, 2026
9b75f62
Resolving merge conflicts & refactoring UserProfile
klnyzzz33 Mar 19, 2026
3213259
Continued UserProfile refactoring, also added the Zeeguu loading anim…
klnyzzz33 Mar 20, 2026
b33e80b
Merge pull request #979 from zeeguu/feature/profile
klnyzzz33 Mar 20, 2026
dc9af98
Merge pull request #980 from zeeguu/master
klnyzzz33 Mar 20, 2026
fb8e978
Continued UserProfile refactoring
klnyzzz33 Mar 20, 2026
65ca3e2
Merge pull request #981 from zeeguu/feature/profile
gabortodor Mar 22, 2026
6f5eebb
Working on gamification feature flag
xXPinkmagicXx Mar 26, 2026
948c753
Using the gamification feature flag is used for the profile route
xXPinkmagicXx Mar 26, 2026
5ab1096
Redirect logic between gamification feature and regular implementation
xXPinkmagicXx Mar 26, 2026
63d997c
Merge pull request #1008 from zeeguu/master
klnyzzz33 Mar 31, 2026
9679468
has_gamification
xXPinkmagicXx Apr 2, 2026
d5f2ef4
Merge pull request #989 from zeeguu/feature/gamification-feature-flag
xXPinkmagicXx Apr 2, 2026
b1d9327
Merge branch 'master' into gamification
gabortodor Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions public/static/avatars/cat.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions public/static/avatars/dog.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading