Skip to content

feat: gamification badges (Issue #1539) - #4569

Merged
Ayushh-Sharmaa merged 1 commit into
Ayushh-Sharmaa:mainfrom
anshika1179:feat-1539-gamification
Aug 12, 2026
Merged

feat: gamification badges (Issue #1539)#4569
Ayushh-Sharmaa merged 1 commit into
Ayushh-Sharmaa:mainfrom
anshika1179:feat-1539-gamification

Conversation

@anshika1179

Copy link
Copy Markdown
Contributor

What does this PR do?

Solves Issue #1539 by introducing Gamification Badges.

  • Updates Prisma schema with Badge and UserBadge models to support many-to-many badge relations.
  • Implements gamificationRoutes.js and gamificationService.js to handle awarding and fetching badges.
  • Creates BadgesList.jsx to render a user's earned badges in a grid on their profile page with tooltips.

Type of Change

  • New feature (non-breaking change which adds functionality)

Tested

  • Tested locally (Badges list gracefully handles empty states and renders properly alongside reputation)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code

@vercel

vercel Bot commented Aug 8, 2026

Copy link
Copy Markdown

@anshika1179 is attempting to deploy a commit to the ayushh-sharmaa's projects Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions github-actions Bot added backend Backend / server related database Database related documentation Improvements or additions to documentation frontend Frontend / website related size/XL Extra-large PR (500+ lines) labels Aug 8, 2026
@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

⚠️ Merge Conflict Detected

Hey @anshika1179! Your PR #4569 has a merge conflict with main that must be resolved before it can be merged.

🔧 How to fix it locally

# 1. Fetch the latest changes
git fetch origin

# 2. Switch to your branch
git checkout feat-1539-gamification

# 3. Rebase onto the base branch  (recommended)
git rebase origin/main
# — OR — merge it in
# git merge origin/main

# 4. Resolve conflicts in your editor, then:
git add .
git rebase --continue   # (if rebasing)
# git commit            # (if merging)

# 5. Push your branch
git push origin feat-1539-gamification --force-with-lease

💡 Tips

  • Use git status to see which files have conflicts
  • Look for <<<<<<, ======, >>>>>> markers in conflicted files
  • VS Code and IntelliJ have built-in merge conflict UIs

Once you push the fix, this label will be removed automatically. 🚀

NexaSphere automation · Mentor: @Ayushh-Sharmaa

@github-actions github-actions Bot added the merge conflict This PR has a merge conflict that must be resolved label Aug 8, 2026
@github-actions github-actions Bot removed the merge conflict This PR has a merge conflict that must be resolved label Aug 8, 2026
@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

✅ Merge Conflict Resolved

The merge conflict has been resolved — this PR is now ready for review! 🎉

NexaSphere automation

@anshika1179
anshika1179 force-pushed the feat-1539-gamification branch from 7bb653f to 8225677 Compare August 8, 2026 14:31
@github-actions github-actions Bot added the merge conflict This PR has a merge conflict that must be resolved label Aug 8, 2026
@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

⚠️ Merge Conflict Detected

Hey @anshika1179! Your PR #4569 has a merge conflict with main that must be resolved before it can be merged.

🔧 How to fix it locally

# 1. Fetch the latest changes
git fetch origin

# 2. Switch to your branch
git checkout feat-1539-gamification

# 3. Rebase onto the base branch  (recommended)
git rebase origin/main
# — OR — merge it in
# git merge origin/main

# 4. Resolve conflicts in your editor, then:
git add .
git rebase --continue   # (if rebasing)
# git commit            # (if merging)

# 5. Push your branch
git push origin feat-1539-gamification --force-with-lease

💡 Tips

  • Use git status to see which files have conflicts
  • Look for <<<<<<, ======, >>>>>> markers in conflicted files
  • VS Code and IntelliJ have built-in merge conflict UIs

Once you push the fix, this label will be removed automatically. 🚀

NexaSphere automation · Mentor: @Ayushh-Sharmaa

@anshika1179
anshika1179 force-pushed the feat-1539-gamification branch 2 times, most recently from 3c44ba4 to 32b1e9d Compare August 8, 2026 14:47
@github-actions github-actions Bot added size/L Large PR (150–499 lines) and removed size/XL Extra-large PR (500+ lines) labels Aug 8, 2026
@anshika1179
anshika1179 force-pushed the feat-1539-gamification branch from 32b1e9d to 087ea60 Compare August 8, 2026 14:49
@github-actions github-actions Bot added size/M Medium PR (50–149 lines) and removed size/L Large PR (150–499 lines) labels Aug 8, 2026
@anshika1179
anshika1179 force-pushed the feat-1539-gamification branch from 087ea60 to 7ecab4f Compare August 8, 2026 14:50
@github-actions github-actions Bot added size/L Large PR (150–499 lines) and removed size/M Medium PR (50–149 lines) labels Aug 8, 2026
@anshika1179
anshika1179 force-pushed the feat-1539-gamification branch 2 times, most recently from 1282339 to a911010 Compare August 8, 2026 15:02
@github-actions github-actions Bot added size/S Small PR (10–49 lines) backlog size and removed size/L Large PR (150–499 lines) labels Aug 8, 2026
@github-actions github-actions Bot added gssoc gssoc approved level GSSoC'26 Automatically applied to issues for GSSoC'26 NSOC'26 Automatically applied to newly opened issues for NSOC'26 size/XS Extra-small PR (< 10 lines) labels Aug 11, 2026
@Ayushh-Sharmaa
Ayushh-Sharmaa merged commit a911010 into Ayushh-Sharmaa:main Aug 12, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend Backend / server related backlog size database Database related documentation Improvements or additions to documentation frontend Frontend / website related gssoc approved gssoc GSSoC'26 Automatically applied to issues for GSSoC'26 level merge conflict This PR has a merge conflict that must be resolved NSOC'26 Automatically applied to newly opened issues for NSOC'26 size/S Small PR (10–49 lines) size/XS Extra-small PR (< 10 lines)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants