From 0c2fb036a8f6bfc958d6bfb4459f8350094ec6f1 Mon Sep 17 00:00:00 2001
From: W47 KRTS <postuionut47@gmail.com>
Date: Fri, 13 Sep 2024 07:44:17 +0000
Subject: [PATCH] ssss

---
 .../src/components/DesktopSidebar.js          | 13 +++-----
 frontend-react-js/src/pages/HomeFeedPage.js   | 31 +++++++++++++------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/frontend-react-js/src/components/DesktopSidebar.js b/frontend-react-js/src/components/DesktopSidebar.js
index a1d5a4a..eb9f5ef 100644
--- a/frontend-react-js/src/components/DesktopSidebar.js
+++ b/frontend-react-js/src/components/DesktopSidebar.js
@@ -17,20 +17,15 @@ export default function DesktopSidebar(props) {
   ]
 
   let trending;
-  if (props.user) {
-    trending = <TrendingSection trendings={trendings} />
-  }
-
   let suggested;
-  if (props.user) {
-    suggested = <SuggestedUsersSection users={users} />
-  }
   let join;
   if (props.user) {
-  } else {
+    trending = <TrendingSection trendings={trendings} />
+    suggested = <SuggestedUsersSection users={users} />
+  } else{
     join = <JoinSection />
   }
-
+  
   return (
     <section>
       <Search />
diff --git a/frontend-react-js/src/pages/HomeFeedPage.js b/frontend-react-js/src/pages/HomeFeedPage.js
index c0aab42..53007e4 100644
--- a/frontend-react-js/src/pages/HomeFeedPage.js
+++ b/frontend-react-js/src/pages/HomeFeedPage.js
@@ -1,6 +1,8 @@
 import './HomeFeedPage.css';
 import React from "react";
 
+import { Auth } from 'aws-amplify';
+
 import DesktopNavigation  from '../components/DesktopNavigation';
 import DesktopSidebar     from '../components/DesktopSidebar';
 import ActivityFeed from '../components/ActivityFeed';
@@ -35,16 +37,25 @@ export default function HomeFeedPage() {
     }
   };
 
+    // check if we are authenicated
   const checkAuth = async () => {
-    console.log('checkAuth')
-    // [TODO] Authenication
-    if (Cookies.get('user.logged_in')) {
-      setUser({
-        display_name: Cookies.get('user.name'),
-        handle: Cookies.get('user.username')
-      })
-    }
-  };
+    Auth.currentAuthenticatedUser({
+      // Optional, By default is false. 
+      // If set to true, this call will send a 
+      // request to Cognito to get the latest user data
+      bypassCache: false 
+    })
+    .then((user) => {
+      console.log('user',user);
+      return Auth.currentAuthenticatedUser()
+    }).then((cognito_user) => {
+        setUser({
+          display_name: cognito_user.attributes.name,
+          handle: cognito_user.attributes.preferred_username
+        })
+    })
+    .catch((err) => console.log(err));
+};
 
   React.useEffect(()=>{
     //prevents double call
@@ -81,4 +92,4 @@ export default function HomeFeedPage() {
       <DesktopSidebar user={user} />
     </article>
   );
-}
\ No newline at end of file
+}