fix: PetType and refactored list

redxzeta · May 11, 2022 · 96c7ea1 · 96c7ea1
1 parent 5fc872d
commit 96c7ea1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/components/pets/PetType.tsx b/src/components/pets/PetType.tsx
@@ -12,7 +12,7 @@ import {
 } from "react-bootstrap";
 import { Navigate, useParams } from "react-router-dom";
 import useSWR from "swr";
-import { PetListType } from "types/PetType";
+import { PET_LIST_CONST, PetListType } from "types/PetType";
 
 import { usePetAuth } from "../../context/TokenContext";
 import { petFinderURL } from "../../routes/API";
@@ -34,7 +34,8 @@ export default function PetType() {
   const { type } = useParams<{ type: PetListType }>();
   const { tokenHeaders } = usePetAuth();
 
-  if (!type) return <Navigate to={"/pet"} replace={true} />;
+  if (!type || !PET_LIST_CONST.includes(type))
+    return <Navigate to={"/pets"} replace={true} />;
 
   // Fetching the data through SWR
   const { data: petSearchList, error: fetcherror } = useSWR(

diff --git a/src/types/PetType.ts b/src/types/PetType.ts
@@ -3,17 +3,20 @@ export type AnimalPhotos = {
   medium: string;
 };
 
-export type PetListType =
-  | "Dog"
-  | "Cat"
-  | "Rabbit"
-  | "Horse"
-  | "Bird"
-  | "dog"
-  | "cat"
-  | "rabbit"
-  | "horse"
-  | "bird";
+export const PET_LIST_CONST = [
+  "Dog",
+  "Cat",
+  "Rabbit",
+  "Horse",
+  "Bird",
+  "dog",
+  "cat",
+  "rabbit",
+  "horse",
+  "bird",
+] as const;
+
+export type PetListType = typeof PET_LIST_CONST[number];
 
 export type PetCardType = {
   id: string;