From fc9994d42ecb2cb29439443aaed2f68cdaad8307 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Thu, 5 Dec 2019 13:47:10 -0500
Subject: [PATCH] fixed circular progress on home

---
 twistter-frontend/src/pages/Home.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/twistter-frontend/src/pages/Home.js b/twistter-frontend/src/pages/Home.js
index dbe4a58..3169623 100644
--- a/twistter-frontend/src/pages/Home.js
+++ b/twistter-frontend/src/pages/Home.js
@@ -42,7 +42,7 @@ class Home extends Component {
 
   componentDidMount() {
     this.setState({loading: true});
-    axios
+    let userPromise = axios
       .get("/user")
       .then(res => {
         this.setState({
@@ -52,17 +52,26 @@ class Home extends Component {
       })
       .catch(err => console.log(err));
 
-    axios
+    let postPromise = axios
       .get("/getallPosts")
       .then(res => {
         // console.log(res.data);
         this.setState({
-          posts: res.data,
-          loading: false
+          posts: res.data
         });
       })
       .catch(err => console.log(err));
 
+      Promise.all([userPromise, postPromise])
+        .then(() => {
+          this.setState({
+            loading: false
+          })
+        })
+        .catch((error) => {
+          console.log(error);
+        })
+
     this.props.getLikes();
   }