Skip to content

fix: feat: Party Panel UI - Squad Display on Quest Detail Page #137#202

Open
Adil2009700 wants to merge 3 commits into
mainfrom
fix/issue-137-party-panel
Open

fix: feat: Party Panel UI - Squad Display on Quest Detail Page #137#202
Adil2009700 wants to merge 3 commits into
mainfrom
fix/issue-137-party-panel

Conversation

@Adil2009700
Copy link
Copy Markdown
Collaborator

Closes #137

@vercel
Copy link
Copy Markdown
Contributor

vercel Bot commented Apr 28, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
adventurers-guild Ready Ready Preview, Comment Apr 28, 2026 1:24pm

@LarytheLord
Copy link
Copy Markdown
Owner

Hi @Adil2009700 — see the master coordination comment on PR #200 for the proposed merge order.

Major blocker — pick one of #199 or #202:

This PR (#202) and PR #199 are near-duplicates of the party/squad system. Both add the same app/api/parties/** routes, the same PartyPanel.tsx, and the same Party model in schema.prisma.

We can only merge one. Differences:

Heads up: PR #189 from @Sanila-577 also implements squad-aware quest board UI (issue #111) but with a cleaner, narrower diff. Worth aligning with them.

Please decide:

  1. Close one of fix: feat: Squad-Aware Quest Board UI - party slots, join flow, and squad filtering #111 #199 or fix: feat: Party Panel UI - Squad Display on Quest Detail Page #137 #202 (your choice)
  2. Coordinate with @Sanila-577 on feat: squad-aware quest board with party indicators and join flow closes #111 #189
  3. Strip Stripe references — project uses Razorpay only

Other blockers: rebase needed, CI never ran.

@LarytheLord
Copy link
Copy Markdown
Owner

⚠️ This PR is conflicting against main and CI has not run yet.

Please:

  1. git fetch origin && git rebase origin/main
  2. Resolve any conflicts
  3. git push --force-with-lease

This will trigger CI and allow review. See the coordination comment on PR #200 for the proposed merge order for this batch.

@Adil2009700 Adil2009700 force-pushed the fix/issue-137-party-panel branch from d5d3116 to f356aa7 Compare May 8, 2026 17:46
@Adil2009700 Adil2009700 requested a review from LarytheLord as a code owner May 8, 2026 17:46
@vercel
Copy link
Copy Markdown
Contributor

vercel Bot commented May 8, 2026

Deployment failed with the following error:

Environment Variable "NEXT_PUBLIC_APP_URL" references Secret "app-url", which does not exist.

Learn More: https://vercel.com/docs/environment-variables

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.

feat: Party Panel UI — Squad Display on Quest Detail Page

2 participants