@@ -233,16 +206,12 @@ export function EncounterModal({
loadingPokemon ||
!routePokemon ||
(dupedPokemonIds
- ? routePokemon.every((rp) =>
- dupedPokemonIds.has(rp.pokemonId)
- )
+ ? routePokemon.every((rp) => dupedPokemonIds.has(rp.pokemonId))
: false)
}
onClick={() => {
if (routePokemon) {
- setSelectedPokemon(
- pickRandomPokemon(routePokemon, dupedPokemonIds)
- )
+ setSelectedPokemon(pickRandomPokemon(routePokemon, dupedPokemonIds))
}
}}
className="px-2.5 py-1 text-xs font-medium rounded-lg border border-purple-300 dark:border-purple-600 text-purple-600 dark:text-purple-400 hover:bg-purple-50 dark:hover:bg-purple-900/20 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
@@ -279,15 +248,12 @@ export function EncounterModal({
)}
{pokemon.map((rp) => {
- const isDuped =
- dupedPokemonIds?.has(rp.pokemonId) ?? false
+ const isDuped = dupedPokemonIds?.has(rp.pokemonId) ?? false
return (
@@ -360,7 +320,7 @@ export function EncounterModal({
/>
) : (
- {existing.pokemon.name[0].toUpperCase()}
+ {existing.pokemon.name[0]?.toUpperCase()}
)}
diff --git a/frontend/src/components/EndRunModal.tsx b/frontend/src/components/EndRunModal.tsx
index 4dc79eb..2059e94 100644
--- a/frontend/src/components/EndRunModal.tsx
+++ b/frontend/src/components/EndRunModal.tsx
@@ -7,12 +7,7 @@ interface EndRunModalProps {
genlockeContext?: RunGenlockeContext | null
}
-export function EndRunModal({
- onConfirm,
- onClose,
- isPending,
- genlockeContext,
-}: EndRunModalProps) {
+export function EndRunModal({ onConfirm, onClose, isPending, genlockeContext }: EndRunModalProps) {
const victoryDescription = genlockeContext
? genlockeContext.isFinalLeg
? 'Complete the final leg of your genlocke!'
@@ -31,9 +26,7 @@ export function EndRunModal({
End Run
-
- How did your run end?
-
+
How did your run end?
) : (
-
+
{game.name.replace('Pokemon ', '')}
)}
-
- {game.name}
-
+
{game.name}
{game.region.charAt(0).toUpperCase() + game.region.slice(1)}
{game.releaseYear && (
-
- {game.releaseYear}
-
+ {game.releaseYear}
)}
@@ -65,11 +58,7 @@ export function GameCard({ game, selected, onSelect }: GameCardProps) {
stroke="currentColor"
strokeWidth={3}
>
-
+
)}
diff --git a/frontend/src/components/GameGrid.tsx b/frontend/src/components/GameGrid.tsx
index 75f81f5..35056f9 100644
--- a/frontend/src/components/GameGrid.tsx
+++ b/frontend/src/components/GameGrid.tsx
@@ -18,7 +18,7 @@ interface GameGridProps {
games: Game[]
selectedId: number | null
onSelect: (game: Game) => void
- runs?: NuzlockeRun[]
+ runs?: NuzlockeRun[] | undefined
}
export function GameGrid({ games, selectedId, onSelect, runs }: GameGridProps) {
@@ -27,38 +27,26 @@ export function GameGrid({ games, selectedId, onSelect, runs }: GameGridProps) {
const [hideWithActiveRun, setHideWithActiveRun] = useState(false)
const [hideCompleted, setHideCompleted] = useState(false)
- const generations = useMemo(
- () => [...new Set(games.map((g) => g.generation))].sort(),
- [games]
- )
+ const generations = useMemo(() => [...new Set(games.map((g) => g.generation))].sort(), [games])
- const regions = useMemo(
- () => [...new Set(games.map((g) => g.region))].sort(),
- [games]
- )
+ const regions = useMemo(() => [...new Set(games.map((g) => g.region))].sort(), [games])
const activeRunGameIds = useMemo(() => {
if (!runs) return new Set
()
- return new Set(
- runs.filter((r) => r.status === 'active').map((r) => r.gameId)
- )
+ return new Set(runs.filter((r) => r.status === 'active').map((r) => r.gameId))
}, [runs])
const completedRunGameIds = useMemo(() => {
if (!runs) return new Set()
- return new Set(
- runs.filter((r) => r.status === 'completed').map((r) => r.gameId)
- )
+ return new Set(runs.filter((r) => r.status === 'completed').map((r) => r.gameId))
}, [runs])
const filtered = useMemo(() => {
let result = games
if (filter) result = result.filter((g) => g.generation === filter)
if (regionFilter) result = result.filter((g) => g.region === regionFilter)
- if (hideWithActiveRun)
- result = result.filter((g) => !activeRunGameIds.has(g.id))
- if (hideCompleted)
- result = result.filter((g) => !completedRunGameIds.has(g.id))
+ if (hideWithActiveRun) result = result.filter((g) => !activeRunGameIds.has(g.id))
+ if (hideCompleted) result = result.filter((g) => !completedRunGameIds.has(g.id))
return result
}, [
games,
@@ -91,9 +79,7 @@ export function GameGrid({ games, selectedId, onSelect, runs }: GameGridProps) {
-
- Gen:
-
+ Gen:
-
- Region:
-
+
Region:
{entry.nickname && (
-
- {displayPokemon.name}
-
+
{displayPokemon.name}
)}
@@ -50,9 +48,7 @@ function GraveyardCard({ entry }: { entry: GraveyardEntry }) {
Lv. {entry.catchLevel} → {entry.faintLevel}
-
- {entry.routeName}
-
+
{entry.routeName}
Leg {entry.legOrder} — {entry.gameName}
@@ -134,8 +130,8 @@ export function GenlockeGraveyard({ genlockeId }: GenlockeGraveyardProps) {
{data.deadliestLeg && (
- Deadliest: Leg {data.deadliestLeg.legOrder} —{' '}
- {data.deadliestLeg.gameName} ({data.deadliestLeg.deathCount})
+ Deadliest: Leg {data.deadliestLeg.legOrder} — {data.deadliestLeg.gameName} (
+ {data.deadliestLeg.deathCount})
)}
@@ -144,9 +140,7 @@ export function GenlockeGraveyard({ genlockeId }: GenlockeGraveyardProps) {
+