Skip to content

update - #6

Merged
R3Nexe merged 6 commits into
sky-ruler:mainfrom
nirakarpatel:main
May 1, 2026
Merged

update#6
R3Nexe merged 6 commits into
sky-ruler:mainfrom
nirakarpatel:main

Conversation

@nirakarpatel

Copy link
Copy Markdown
Contributor

🚀 Overview

These 5 commits are the "glue" that hold the project together. They fixed all the conflicts that happened when merging different parts of the code, ensuring that all our newest features (like Clan Management and the Notice System) work perfectly with our premium design. Basically, these commits made the website stable, error-free, and ready for use.

🛠️ Key Changes

  • Fixed Broken Pages: Repaired the Dashboard and Leaderboard pages after they got mixed up during a code update.
  • Combined Best Features: Merged the new search bar and filters into our existing 3D-podium design.
  • Restored Mission Groups: Fixed the feature that lets users view missions organized by week or month.
  • Saved Custom Design: Successfully brought in updates from other team members without losing our "cinematic" look.
  • Easier Admin Work: Updated the rules so admins can save new missions and challenges more quickly.
  • Cleaned Up Code: Removed redundant "conflict markers" and broken imports to stop the app from crashing.

@vercel

vercel Bot commented May 1, 2026

Copy link
Copy Markdown

Someone is attempting to deploy a commit to the Sky Ruler's projects Team on Vercel.

A member of the Team first needs to authorize it.

@R3Nexe
R3Nexe merged commit 3a12dc3 into sky-ruler:main May 1, 2026
1 of 3 checks passed
@R3Nexe R3Nexe mentioned this pull request May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants