render values dynamically on pet page (#148)

smartuni · Jul 1, 2024 · 6acad5b · 6acad5b
2 parents ea5bfcf + c345222
commit 6acad5b
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 20 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -51,18 +51,17 @@ function App() {
 
     // https://github.com/openapi-ts/openapi-typescript/tree/main/packages/openapi-fetch
     (async () => {
-      console.log("hi there!");
-      const { data, error } = await client.GET("/api/v1/devices/self", {});
-
-      console.log("data", data);
-      console.log("error", error);
+      //   console.log("hi there!");
+      //   const { data, error } = await client.GET("/api/v1/devices/self", {});
+      //   console.log("data", data);
+      //   console.log("error", error);
     })();
 
     return (
       <div style={{ backgroundColor: "#FFFFFF" }}>
         <div>
           <div>
-            <Navbar />
+            <Navbar client={client} />
           </div>
         </div>
         {/* <div>

diff --git a/frontend/src/Components/Navbar/Navbar.tsx b/frontend/src/Components/Navbar/Navbar.tsx
@@ -8,7 +8,7 @@ import LinkDevice from "../LinkDevice.tsx";
 import { useAuth } from "react-oidc-context";
 import "./navbar.css";
 
-const Navbar = () => {
+const Navbar = (client) => {
   const auth = useAuth();
   const [activePage, setActivePage] = useState("Pet Page");
 
@@ -146,7 +146,7 @@ const Navbar = () => {
             }
           />
           <Route path="/Friends" element={<Friends />} />
-          <Route path="/PetPage" element={<PetPage />} />
+          <Route path="/PetPage" element={<PetPage client={client} />} />
         </Routes>
       </Router>
     </div>

diff --git a/frontend/src/Components/PetPage.tsx b/frontend/src/Components/PetPage.tsx
@@ -1,23 +1,49 @@
 import { useEffect, useState } from "react";
 import petImage from "../assets/pet_frog.png";
 import { ProgressBar } from "react-progressbar-fancy";
-import type { paths } from "../../src/web-backend-api";
+import type { paths, components } from "../../src/web-backend-api";
 import { useAuth } from "react-oidc-context";
 import CreatePetModal from "./CreatePetModal";
-
+import createClient, { type Middleware } from "openapi-fetch";
 // https://github.com/RavinRau/react-progressbar-fancy?tab=readme-ov-file
 
-const PetPage = (client) => {
-  const [petData, setPetData] = useState([]);
+type PetDTO = components["schemas"]["PetDTO"];
+
+const PetPage = () => {
+  const auth = useAuth();
+  const authMiddleware: Middleware = {
+    async onRequest({ request }) {
+      // add Authorization header to every request
+      request.headers.set("Authorization", `Bearer ${auth.user?.access_token}`);
+      return request;
+    },
+  };
 
+  const client = createClient<paths>({
+    baseUrl: "http://localhost:4000/backend",
+  });
+  client.use(authMiddleware);
+
+  const [petData, setPetData] = useState({} as PetDTO);
   useEffect(() => {
     loadData();
   }, []);
 
   const loadData = async () => {
-    const { response, error } = await client.GET("/api/v1/devices/self", {});
-    if (error != null) {
-      setPetData(await client.GET(`/api/v1/pets/self/${response.petId}`));
+    const { data, error } = await client.GET("/api/v1/devices/self", {});
+    if (data && data[0].petId != undefined) {
+      const { data: data2, error } = await client.GET(
+        "/api/v1/pets/self/{petId}",
+        {
+          params: {
+            path: { petId: +data[0].petId },
+          },
+        }
+      );
+      console.log(data2);
+      if (data2) {
+        setPetData(data2);
+      }
     }
   };
 
@@ -33,23 +59,25 @@ const PetPage = (client) => {
         )}
       </div>
       <div className="col-6">
-        <div className="h2 px-3 py-4">( Pet name )</div>
+        <div className="h2 px-3 py-4">{petData.name}</div>
         <div>
           <div className="h5 px-3">HP</div>
           <ProgressBar
             className="px-1 pb-3"
             hideText={true}
             progressColor={"red"}
-            score={100}
+            score={petData.state?.health == null ? 0 : petData.state.health}
           />
         </div>
         <div>
-          <div className="h5 px-3">Happiness</div>
+          <div className="h5 px-3">Well-being</div>
           <ProgressBar
             className="px-1 pb-3"
             hideText={true}
             progressColor={"purple"}
-            score={50}
+            score={
+              petData.state?.wellbeing == null ? 0 : petData.state.wellbeing
+            }
           />
         </div>
         <div>
@@ -58,7 +86,47 @@ const PetPage = (client) => {
             className="px-1"
             hideText={true}
             progressColor={"green"}
-            score={80}
+            score={petData.state?.xp == null ? 0 : petData.state.xp}
+          />
+        </div>
+        <div>
+          <div className="h5 px-3">Cleanliness</div>
+          <ProgressBar
+            className="px-1"
+            hideText={true}
+            progressColor={"green"}
+            score={
+              petData.state?.cleanliness == null ? 0 : petData.state.cleanliness
+            }
+          />
+        </div>
+        <div>
+          <div className="h5 px-3">Fun</div>
+          <ProgressBar
+            className="px-1"
+            hideText={true}
+            progressColor={"green"}
+            score={petData.state?.fun == null ? 0 : petData.state.fun}
+          />
+        </div>
+        <div>
+          <div className="h5 px-3">Hunger</div>
+          <ProgressBar
+            className="px-1"
+            hideText={true}
+            progressColor={"green"}
+            score={petData.state?.hunger == null ? 0 : petData.state.hunger}
+          />
+        </div>
+        <div>
+          <div className="h5 px-3">Happiness</div>
+          <ProgressBar
+            className="px-1"
+            hideText={true}
+            progressColor={"green"}
+            score={
+              petData.state?.happiness == null ? 0 : petData.state.happiness
+            }
           />
         </div>
       </div>