Remove unnecssary loading state in home page feed

pbteja1998 · pbteja1998 · commit bd18b3fd2b2d · 2021-02-18T18:44:38.000+05:30
diff --git a/src/components/HomePageFeed.tsx b/src/components/HomePageFeed.tsx
@@ -25,7 +25,6 @@ import {
 import { User } from 'src/pages/members'
 import AppNavBar from './AppNavBar'
 import AppFooter from './AppFooter'
-import { useRouter } from 'next/router'
 import useFollowUser from './profile/useFollowUser'
 
 type LikeData = {
@@ -267,10 +266,7 @@ export default function HomePageFeed({
 }
 
 function HomePageSideNavBar() {
-  const [session, loading] = useSession()
-  if (loading) {
-    return <p>loading...</p>
-  }
+  const [session] = useSession()
   return (
     <>
       <nav
@@ -391,18 +387,13 @@ function FollowButton({ user }: { user: User }) {
 }
 
 function HomePageAside({ updates }: { updates: HomePageFeedUpdateType[] }) {
-  const router = useRouter()
-  const [session, loading] = useSession()
+  const [session] = useSession()
   const { isLoading, isError, data: response } = useQuery(
     'api/fauna/who-to-follow',
     () => {
       return fetch(`/api/fauna/who-to-follow`).then((res) => res.json())
     }
   )
-  if (loading) {
-    return <p>loading...</p>
-  }
-  console.log({ response })
 
   return (
     <>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -25,7 +25,7 @@ export type HomePageFeedUpdateType = {
 }
 
 export default function Home() {
-  const [session, loading] = useSession()
+  const [session] = useSession()
 
   const { isLoading, isError, data } = useQuery('/api/fauna/all-updates', () =>
     fetch(`/api/fauna/all-updates`).then((res) => {
@@ -49,22 +49,18 @@ export default function Home() {
     })
   })
 
-  if (loading || isLoading || isGoalLoading) {
-    return <p>loading...</p>
-  }
-
   if (isError || isGoalError) {
     return <p>Something went wrong!!!</p>
   }
 
-  const updates = data.updates.data
-
   return (
     <>
       <HomePageFeed
-        updates={updates}
-        showGoal={Boolean(session && goalData?.goal)}
-        goal={goalData.goal}
+        updates={isLoading ? [] : data.updates.data}
+        showGoal={Boolean(
+          !isGoalLoading && !isGoalError && session && goalData?.goal
+        )}
+        goal={goalData?.goal}
       />
     </>
   )
