From ee77e90aa279ccda7f01956a6f80fff65a4b929b Mon Sep 17 00:00:00 2001
From: CodeServer <CodeServer@jlu42.com>
Date: Fri, 25 Mar 2022 10:43:05 +0000
Subject: [PATCH] fixed the but

---
 src/components/home/MeetingsPanel.tsx | 20 ++++++++++++++------
 src/components/login/Login.tsx        | 14 +++++++-------
 src/components/navbar/Clock.tsx       |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/home/MeetingsPanel.tsx b/src/components/home/MeetingsPanel.tsx
index 5fc25bf..778b36a 100644
--- a/src/components/home/MeetingsPanel.tsx
+++ b/src/components/home/MeetingsPanel.tsx
@@ -10,7 +10,7 @@ import UserLite from "../../api-bodies/UserLite";
 const MeetingsPanel: React.FC = () => {
 
   const meetings = useAppSelector(selectMeetings);
-  let uuids: string[] = [];
+  const uuids: string[] = [];
   meetings.forEach((meeting) => {
     meeting.liveParticipantIds.forEach((uuid) => {
       if(!uuids.includes(uuid)) {
@@ -18,10 +18,18 @@ const MeetingsPanel: React.FC = () => {
       }
     });
   });
-  
-  const participants: UserLite[] = useAppSelector((state) =>
-    selectUsers(state, uuids)
+
+  const participants = useAppSelector((state) => 
+    selectUsers(state,uuids)
   );
+  
+  // const participants: (UserLite | undefined)[] = [];
+  // uuids.forEach((uuid) => {
+  //   const userLite = useAppSelector((state) => 
+  //     selectUser(state,uuid)
+  //   );
+  //   participants.push(userLite);
+  // });
 
 
   return (
@@ -42,7 +50,7 @@ const MeetingsPanel: React.FC = () => {
         // );
         const meetingMembers: UserLite[] = [];
         participants.forEach((userLite) => {
-          if (meeting.liveParticipantIds.includes(userLite.uuid)) {
+          if (userLite != undefined && meeting.liveParticipantIds.includes(userLite.uuid)) {
             meetingMembers.push(userLite);
           }
         });
@@ -52,7 +60,7 @@ const MeetingsPanel: React.FC = () => {
         const endDate = new Date(endDatemil);
         const [currentDate, setCurrentDate] = useState<Date>(new Date());
         useEffect(() => {
-          setInterval(() => setCurrentDate(new Date()), 30000);
+          setInterval(() => setCurrentDate(new Date()), 1000);
         }, []);
 
         const currentDatemil = currentDate.getTime();
diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx
index 397c4a9..493ab33 100644
--- a/src/components/login/Login.tsx
+++ b/src/components/login/Login.tsx
@@ -27,6 +27,7 @@ const Login: React.FC = () => {
 
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
+  const [logedInUser, setLogedInUser] = useState("");
   // const [errMsg, setErrMsg] = useState('');
 
   // const userRef = useRef();
@@ -40,6 +41,10 @@ const Login: React.FC = () => {
   //     setErrMsg('');
   // }, [user, pwd])
 
+  store.dispatch(fetchMeetings(logedInUser));
+  store.dispatch(fetchUsers(logedInUser));
+  store.dispatch(fetchFavorites(logedInUser));
+
   const handleLogin = async(e: React.SyntheticEvent) => {
     e.preventDefault();
 
@@ -47,10 +52,7 @@ const Login: React.FC = () => {
       if (email === "" && password === "") {
         setAuth["email"] = email;
         setAuth["isLoggedIn"] = true;
-  
-        store.dispatch(fetchMeetings(""));
-        store.dispatch(fetchUsers(""));
-        store.dispatch(fetchFavorites(""));
+
         navigate(from, { replace: true });
       }
 
@@ -71,9 +73,7 @@ const Login: React.FC = () => {
         setAuth["email"] = email;
         setAuth["isLoggedIn"] = true;
   
-        store.dispatch(fetchMeetings(logedInUserId));
-        store.dispatch(fetchUsers(logedInUserId));
-        store.dispatch(fetchFavorites(logedInUserId));
+        setLogedInUser(logedInUserId);
         navigate(from, { replace: true });
       }
 
diff --git a/src/components/navbar/Clock.tsx b/src/components/navbar/Clock.tsx
index 2de6a3b..d42da13 100644
--- a/src/components/navbar/Clock.tsx
+++ b/src/components/navbar/Clock.tsx
@@ -13,7 +13,7 @@ const Clock: React.FC = () => {
   const [date, setDate] = useState<Date>(new Date());
 
   useEffect(() => {
-    setInterval(() => setDate(new Date()), 30000);
+    setInterval(() => setDate(new Date()), 1000);
   }, []);
 
   return (