From 979bbe2a7f9cb388968f9e67fc4cc461246be4c9 Mon Sep 17 00:00:00 2001
From: yudejp <i@yude.jp>
Date: Sat, 2 Oct 2021 14:23:12 +0900
Subject: [PATCH] Fix implementation of heartrate retrieving, Update styling

---
 pages/api/Fitbit/Heartrate.js        | 20 +++++++++++---------
 pages/components/Fitbit/Heartrate.js |  4 +++-
 pages/components/Fitbit/Sleep.js     |  4 +++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/api/Fitbit/Heartrate.js b/pages/api/Fitbit/Heartrate.js
index 903846f..7a15e2d 100644
--- a/pages/api/Fitbit/Heartrate.js
+++ b/pages/api/Fitbit/Heartrate.js
@@ -10,7 +10,7 @@ const today = format(new Date(), 'yyyy-MM-dd')
 export const getName = async (props) => {
   const uuid = props;
   return fetch(
-        'https://api.fitbit.com/1/user/-/activities/heart/date/today/1d/1sec.json',
+        'https://api.fitbit.com/1/user/-/activities/heart/date/today/1d/1sec/time/00:00/23:59.json',
         {
             headers: {
                 Authorization: `Bearer ${bearer}`,
@@ -26,14 +26,16 @@ const FitbitHeartrate = async (req, res) => {
     if (response.status === 204 || response.status > 400) {
       return res.status(200).send("404");
     }
-    const heartrate = data["activities-heart"].map((item, i) => {
-            if (item.dateTime = today) {
-                return item.value.restingHeartRate
-            } else {
-                return "Failed to retrieve data."
-            }
-        }
-    )
+    // const heartrate = data.map((item, i) => {
+    //         if (item.dateTime = today) {
+    //             return item
+    //         } else {
+    //             return "Failed to retrieve data."
+    //         }
+    //     }
+    // )
+    const array = data["activities-heart-intraday"].dataset
+    const heartrate = array[array.length - 1]
     return res.status(200).json({
       heartrate,
     });
diff --git a/pages/components/Fitbit/Heartrate.js b/pages/components/Fitbit/Heartrate.js
index 4de566a..e6f810b 100644
--- a/pages/components/Fitbit/Heartrate.js
+++ b/pages/components/Fitbit/Heartrate.js
@@ -26,7 +26,9 @@ function App (props) {
     } else {
         return (
             <>
-                <FontAwesomeIcon icon={faHeartbeat} className="w-5 h-5 inline ml-3"/> {data.heartrate}
+                <FontAwesomeIcon icon={faHeartbeat} className="w-5 h-5 inline ml-3"/>
+                &nbsp;
+                {data.heartrate.value}
             </>
         )
     }
diff --git a/pages/components/Fitbit/Sleep.js b/pages/components/Fitbit/Sleep.js
index 1e3da7d..8b9052a 100644
--- a/pages/components/Fitbit/Sleep.js
+++ b/pages/components/Fitbit/Sleep.js
@@ -32,7 +32,9 @@ function App (props) {
         }
         return (
             <>
-                <FontAwesomeIcon icon={faBed} className="w-5 h-5 inline"/> {hours}:{minutes}
+                <FontAwesomeIcon icon={faBed} className="w-5 h-5 inline"/>
+                &nbsp;
+                {hours}:{minutes}
             </>
         )
     }