From 1bcff6c9f80f45df645c32a93d1a6cda3bcb05a7 Mon Sep 17 00:00:00 2001
From: Hannah Gooding <47333850+hannahgooding@users.noreply.github.com>
Date: Wed, 27 May 2020 19:37:20 +0100
Subject: [PATCH] Fix loading states on user and feed page Relates #13 #103

Co-authored-by: Jack Heriz-Smith <jackherizsmith@gmail.com>
Co-authored-by: CampbellDocherty <campbellsofitsidocherty@gmail.com>
Co-authored-by: Alexreid95 <alexreid95@gmail.com>
---
 wip-app/src/pages/FeedPage/FeedPage.js | 5 ++---
 wip-app/src/pages/UserPage/UserPage.js | 7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/wip-app/src/pages/FeedPage/FeedPage.js b/wip-app/src/pages/FeedPage/FeedPage.js
index 407b815..b0250db 100644
--- a/wip-app/src/pages/FeedPage/FeedPage.js
+++ b/wip-app/src/pages/FeedPage/FeedPage.js
@@ -1,6 +1,5 @@
 import React, { useEffect } from "react";
 import { feedPage } from "../../utils/get-fetch";
-// import { ProjectGrid } from "./FeedPage.style";
 import ProjectFeed from "../../components/ProjectFeed/ProjectFeed";
 
 const FeedPage = (props) => {
@@ -13,8 +12,8 @@ const FeedPage = (props) => {
   return (
     <>
       <h1>Feed Page</h1>
-      {projects === [] ? (
-        <h2>Loading...</h2>
+      {projects.length === 0 ? (
+        <h2>Loading your feed...</h2>
       ) : (
         <ProjectFeed projects={projects} />
       )}
diff --git a/wip-app/src/pages/UserPage/UserPage.js b/wip-app/src/pages/UserPage/UserPage.js
index b671366..6828fb0 100644
--- a/wip-app/src/pages/UserPage/UserPage.js
+++ b/wip-app/src/pages/UserPage/UserPage.js
@@ -29,14 +29,11 @@ const UserPage = (props) => {
     user_link_3,
   } = userInfo;
 
-  console.log("userlink", user_link_1);
-
   return (
     <>
-      {userInfo === [] || userProjects === [] ? (
-        <h1>Loading...</h1>
+      {userInfo.length === 0 || userProjects.length === 0 ? (
+        <h1>Loading your profile...</h1>
       ) : (
-        // this is not rendering
         <>
           <ProfileCard>
             <h1>{username}'s Profile</h1>