Changes - who cares

Author: AlexanderNeo427

src/others/Globals.ts

@@ -14,17 +14,20 @@ export abstract class BreedData { }
 export class DogBreedData extends BreedData {
     breed: string
     // bredFor: string[]
-    heightRangeCM: number[]
-    lifespanRange: number[]
+    // heightRangeCM: number[]
+    // lifespanRange: number[]
     // temperament: string[]
     // weightKG: number[]
 
     constructor(breedsObj: any) {
+        console.log("About to construct from this obj: ", breedsObj)
+
         super()
         this.breed = breedsObj.breed
         // this.bredFor = breedsObj.bred_for.split(",").map((s: string) => s.trim())
-        this.heightRangeCM = breedsObj.height.metric.split("-").map((h: string) => parseInt(h))
-        this.lifespanRange = breedsObj.life_span.split("-").map((ls: string) => parseInt(ls))
+        // this.heightRangeCM = breedsObj.height.metric.split("-").map((h: string) => parseInt(h))
+        console.log("Dog Height Data: ", breedsObj.height.metric)
+        // this.lifespanRange = breedsObj.life_span.split("-").map((ls: string) => parseInt(ls))
     }
 }
 
@@ -85,8 +88,10 @@ export const Utils = {
         return new Date(randomTimestamp);
     },
     convertToPetApiData(obj: any, apiType: PET_API_TYPE): PetApiData {
+        console.log(apiType, obj.breeds[0])
         return new PetApiData(
-            obj.id, obj.url,
+            obj.id, obj.url, 
+            new DogBreedData(obj),
             apiType === PET_API_TYPE.DOG ?
                 new DogBreedData(obj.breeds[0]) : 
                 new CatBreedData(obj.breeds[0]),

src/pages/AdoptionGalleryPage.tsx

@@ -13,21 +13,22 @@ const AdoptionGalleryPage: React.FC = () => {
          const imageCount = Math.ceil(fetchCount / 2)
 
          try {
-            const catApiRes = await axios.get(
-               `https://api.thecatapi.com/v1/images/search?has_breeds=1&limit=${imageCount}`, {
-                  headers: { 'x-api-key': import.meta.env.VITE_CAT_API_KEY }
-               }
-            )
+            // const catApiRes = await axios.get(
+            //    `https://api.thecatapi.com/v1/images/search?has_breeds=1&limit=${imageCount}`, {
+            //       headers: { 'x-api-key': import.meta.env.VITE_CAT_API_KEY }
+            //    }
+            // )
             const dogApiRes = await axios.get(
                `https://api.thedogapi.com/v1/images/search?has_breeds=1&limit=${imageCount}`, { 
                   headers: { 'x-api-key': import.meta.env.VITE_DOG_API_KEY 
                }
             })
 
             const allPetData = [
-               ...catApiRes.data
-                           .map((obj: any) => Utils.convertToPetApiData(obj, PET_API_TYPE.CAT))
-                           .filter((petData: PetApiData) => !petData.imgURL.endsWith('.gif')),
+               // ...catApiRes.data
+               //             .map((obj: any) => Utils.convertToPetApiData(obj, PET_API_TYPE.CAT))
+               //             .filter((petData: PetApiData) => !petData.imgURL.endsWith('.gif'))
+               // ,
                ...dogApiRes.data
                            .map((obj: any) => Utils.convertToPetApiData(obj, PET_API_TYPE.DOG))
                            .filter((petData: PetApiData) => !petData.imgURL.endsWith('.gif'))
@@ -37,10 +38,10 @@ const AdoptionGalleryPage: React.FC = () => {
             setPetData(allPetData)
          }
          catch (err: any) {
-            console.error("Error fetching from TheCatAPI: ", err.message)
+            console.error("Error fetching from API: ", err.message)
          }
       }
-      fetchPetApiData(6)
+      fetchPetApiData(1)
    }, [])
 
    return (