Skip to content

[FIX] Truly get correct pokemon name (fixup) #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2023
Merged

[FIX] Truly get correct pokemon name (fixup) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pokemon-detail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export class PokemonDetails {
try {
const response = await fetch(`https://pokeapi.co/api/v2/pokemon/${id}`);
const data = await response.json();
const response2 = await fetch(`https://pokeapi.co/api/v2/pokemon-species/${id}`);
const data2 = await response2.json();
const speciesResponse = await fetch(`https://pokeapi.co/api/v2/pokemon-species/${id}`);
const speciesData = await speciesResponse.json();
const imageUrl = data.sprites.front_default;
const officialArtworkUrl = data.sprites.other["official-artwork"].front_default;
const height = data.height;
Expand All @@ -71,7 +71,7 @@ export class PokemonDetails {
const damageRelations = await getPokemonDamageRelations(id);
const pokedexDescriptions = await getPokemonDescriptions(id);
const codename = data.species.name;
const nameEntry = data2.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
const nameEntry = speciesData.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
const name = nameEntry ? nameEntry.name : codename.charAt(0).toUpperCase() + codename.slice(1);
return new PokemonDetails(
id,
Expand Down
2 changes: 1 addition & 1 deletion pokemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class Pokemon {
const is_legendary = speciesData.is_legendary;
const is_mythical = speciesData.is_mythical;
const codename = data.species.name;
const nameEntry = data2.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
const nameEntry = speciesData.names.find((entry: { language: { name: string } }) => entry.language.name === 'en');
const name = nameEntry ? nameEntry.name : codename.charAt(0).toUpperCase() + codename.slice(1);

pokemons.push(new Pokemon(i, name, codename, imageUrl, types, is_baby, is_legendary, is_mythical));
Expand Down