feat: #112 Add more mercenary team options#113
Merged
ianpaschal merged 1 commit intodevelopfrom Jul 9, 2025
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
WalkthroughThis change introduces new codes and names for mercenary teams ("Landsknechte," "Mercenaries," "Pirates") and "United Nations" throughout the codebase. It updates display logic, flag rendering, and country options to support these entities, including new styles and code refactoring to accommodate the additions. Changes
Possibly related issues
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 ESLint
npm error Exit handler never called! ✨ Finishing Touches
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (4)
src/components/generic/FlagCircle/customFlags/1x1/xx-lkt.svgis excluded by!**/*.svgsrc/components/generic/FlagCircle/customFlags/1x1/xx-prt.svgis excluded by!**/*.svgsrc/components/generic/FlagCircle/customFlags/4x3/xx-lkt.svgis excluded by!**/*.svgsrc/components/generic/FlagCircle/customFlags/4x3/xx-prt.svgis excluded by!**/*.svg
📒 Files selected for processing (6)
.vscode/settings.json(1 hunks)src/components/generic/FlagCircle/FlagCircle.module.scss(1 hunks)src/components/generic/FlagCircle/FlagCircle.scss(0 hunks)src/components/generic/FlagCircle/FlagCircle.tsx(2 hunks)src/utils/common/getCountryName.ts(1 hunks)src/utils/common/getCountryOptions.ts(1 hunks)
💤 Files with no reviewable changes (1)
- src/components/generic/FlagCircle/FlagCircle.scss
🔇 Additional comments (7)
.vscode/settings.json (1)
11-11: LGTM: Spell checker update for new terminology.Adding "Landsknechte" to the spell checker dictionary aligns with the new mercenary team code
xx-lktintroduced in this PR.src/utils/common/getCountryOptions.ts (1)
49-55: All new country codes handled consistently across the codebaseVerified that:
- In
src/utils/common/getCountryOptions.ts(lines 49–55)- In
src/utils/common/getCountryName.ts(codes mapped withif (code === ...))- In
src/components/generic/FlagCircle/FlagCircle.tsx(flag icons for each code)the codes
xx-lkt,xx-mrc,xx-prt, andunare correctly referenced. No missing usages detected—ready to merge.src/components/generic/FlagCircle/FlagCircle.module.scss (1)
28-30: xx-prt.svg files verified
Found in:
- src/components/generic/FlagCircle/customFlags/1x1/xx-prt.svg
- src/components/generic/FlagCircle/customFlags/4x3/xx-prt.svg
No further action required.
src/utils/common/getCountryName.ts (2)
4-15: Excellent handling of new mercenary team codes.The new cases are clearly defined and the naming is consistent with the codes added to
getCountryOptions.ts.
16-19: Good simplification of subdivision logic.The refactored logic using
includes('-')is cleaner and more maintainable than the previous nested structure.src/components/generic/FlagCircle/FlagCircle.tsx (2)
21-28: Excellent migration to CSS modules with proper data attribute usage.The component correctly uses CSS modules and the
data-codeattribute aligns perfectly with the CSS selectors in the module file.
4-4: Good migration from global CSS to CSS modules.The change from global stylesheet to CSS modules improves maintainability and avoids potential style conflicts.
ianpaschal
added a commit
that referenced
this pull request
Jul 18, 2025
* Update update-project-status.yml * Update updateProjectStatus.js * fix: Toast text does not wrap (#87) * fix: #86 Sanitize sign in/sign up inputs (#91) * feat: #32 Auto generate avatars & refactor users (#90) * feat: Improve <TournamentDetailPage/> default tab * feat: Improve <TournamentCard/> styling * Update mockData.ts * feat: #94 Improve <AccordionItem/> disabled state (#97) * feat: #95 Hide completed pairings from match check-in (#96) * bug: #93 Preserve <TournamentPairingsGrid/> internal state (#98) * feat: #101 Add player count to roster (#103) * feat: Show full player names when tournaments require it * feat: Add activePlayerCount to deep tournaments * feat: Sort tournament competitors by name * task: #100 Clean-up .card mixin (#102) * feat: #99 Improve tournament competitor edit dialog (#104) * feat: #106 Improve signIn error handling (#107) * Update convex/_model/tournamentCompetitors/queries/getTournamentCompetitorsByTournament.ts * Update convex/_model/users/_helpers/checkUserTournamentForcedName.ts * feat: Hide players with 0 matches from rankings * feat: #112 Add more mercenary team options (#113) * feat: #110 Add manual table assignments (#111) * fix: Ensure round 0 rankings can be included * Refactor tournament actions (#114) * refactor: Improve tournament actions * chore: Clean-up Convex errors * fix: Do not try to clean up current round timer on tournament end * fix: Don't allow players to be removed from tournament * chore: Update test tournament banner image * Update TournamentCard.tsx * fix: Ensure round 0 rankings can be included * fix: Fix end tournament round context menu behavior * chore: Improve mock match result creation * feat: Allow matchResult.playedAt to be date string or number * feat: #115 Hide match result battle plans (#116) * feat: Set page title based on <PageWrapper/> title prop * fix: Use <IdentityBadge/> to fix player name spacing on match results * fix: Correctly include match results relevant to a tournament
ianpaschal
added a commit
that referenced
this pull request
Jul 24, 2025
* Update update-project-status.yml * Update updateProjectStatus.js * fix: Toast text does not wrap (#87) * fix: Sanitize sign in/sign up inputs (#91) #86 * feat: #32 Auto generate avatars & refactor users (#90) * feat: Improve <TournamentDetailPage/> default tab * feat: Improve <TournamentCard/> styling * Update mockData.ts * feat: Improve <AccordionItem/> disabled state (#97) #94 * feat: Hide completed pairings from match check-in (#96) #95 * bug: Preserve <TournamentPairingsGrid/> internal state (#98) #93 * feat: #101 Add player count to roster (#103) * feat: Show full player names when tournaments require it * feat: Add activePlayerCount to deep tournaments * feat: Sort tournament competitors by name * task: Clean-up .card mixin (#102) #100 * feat: #99 Improve tournament competitor edit dialog (#104) * feat: #106 Improve signIn error handling (#107) * Update convex/_model/tournamentCompetitors/queries/getTournamentCompetitorsByTournament.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update convex/_model/users/_helpers/checkUserTournamentForcedName.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * feat: Hide players with 0 matches from rankings * feat: #112 Add more mercenary team options (#113) * feat: #110 Add manual table assignments (#111) * fix: Ensure round 0 rankings can be included * Refactor tournament actions (#114) * refactor: Improve tournament actions * chore: Clean-up Convex errors * fix: Do not try to clean up current round timer on tournament end * fix: Don't allow players to be removed from tournament * chore: Update test tournament banner image * Update TournamentCard.tsx * fix: Ensure round 0 rankings can be included * fix: Fix end tournament round context menu behavior * chore: Improve mock match result creation * feat: Allow matchResult.playedAt to be date string or number * feat: #115 Hide match result battle plans (#116) * feat: Set page title based on <PageWrapper/> title prop * fix: Use <IdentityBadge/> to fix player name spacing on match results * fix: Correctly include match results relevant to a tournament * feat: #57 Implement basic dashboard (#119) * fix: Remove double border on dashboard sections * fix: Add key to dashboard tournaments * feat: Improve <TournamentPairingRow/> styling * fix: Remove extraneous error message * fix: Improve <Form/> isDirty calculation * fix: Render all competitors in <TournamentCompetitorForm/> * fix: Also show empty state if rankings are empty --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
New Features
Refactor
Chores