Fjernet gamle useEffect som overskrev useQuery, og endret så den fungerte riktig.

webdev-p3/src/components/Pokedisplay/Pokedisplay.tsx

@@ -14,8 +14,7 @@ type pokemon = {
     pokeindex: number,
     name: string,
     img: object,
-    type1: string,
-    type2: string | null,
+    types: string[],
     prevevo: [] | null,
     nextevo: [] | null
 }
@@ -24,29 +23,8 @@ type pokemon = {
 
 export default function Pokedisplay(){
     const [page, setPage] = useState(1);
-
     useEffect(() => {
-        getPokemonList(["pokeIndex","name", "types" ,"img"], page).then((data) => {
-            console.log(data);
-            if (data == null){
-                return
-            }
-            var list = data.pokemonList.map((pokemon:any) => {
-                return {
-                    pokeindex: pokemon.pokeIndex,
-                    name: pokemon.name,
-                    img: pokemon.img,
-                    type1: pokemon.types[0],
-                    type2: pokemon.types[1],
-                    nextevo: pokemon.nextEvo,
-                    prevevo: pokemon.prevEvo
-                }
-            }
-            )
-            setcurrentPokemon(list);
-            
-        });
-    }, [page]);
+        console.log(data);})
 
     const [currentPokemon, setcurrentPokemon] = useState<pokemon[]>([]);
     const {isOpen, toggle, triggerNumber} = Modalhook();
@@ -83,17 +61,16 @@ export default function Pokedisplay(){
         <Modal isOpen={isOpen} toggle={()=>toggle(-1)} pokemonIndex={triggerNumber}></Modal>
         {loading ? <p>Loading...</p> : null}
         {error ? <p>Error :(</p> : null}
-
         {
         data &&
-        currentPokemon.map((pokemon, pokeindex) => {
+        data.pokemonList.map((pokemon:pokemon) => {
 
-            // console.log(pokemon);
+            console.log(pokemon);
             
             
             const found1 = colors.find(obj => {
 
-                return obj.poketype === pokemon.type1;
+                return obj.poketype === pokemon.types[0]
             });    
             
             // console.log(found1);
@@ -101,11 +78,11 @@ export default function Pokedisplay(){
 
             const found2 = colors.find(obj => {
 
-                if(pokemon.type2 === undefined){
-                    return obj.poketype === pokemon.type1;
+                if(pokemon.types.length == 1){
+                    return obj.poketype === pokemon.types[0];
                 }
                 
-                return obj.poketype === pokemon.type2;
+                return obj.poketype === pokemon.types[1]
             });