Merge branch 'narayan954:master' into post-UI-improve

Tisha6661 · Jul 9, 2023 · 4846d27 · 4846d27
2 parents 72c40a3 + 2539f7d
commit 4846d27
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/components/Post/index.jsx b/src/components/Post/index.jsx
@@ -61,7 +61,7 @@ function Post(prop) {
             snapshot.docs.map((doc) => ({
               id: doc.id,
               content: doc.data(),
-            }))
+            })),
           );
         });
     }

diff --git a/src/lib/firebase.js b/src/lib/firebase.js
@@ -39,7 +39,7 @@ function handleMultiUpload(files, options = {}) {
       onUploadProgress: (_percentage) => {},
       generateThumbnails: false,
     },
-    options
+    options,
   );
 
   let totalSize = 0;
@@ -71,7 +71,7 @@ function handleMultiUpload(files, options = {}) {
           lastUploadedSize = snapshot.bytesTransferred;
 
           _options.onUploadProgress(
-            Math.round((totalUploaded / totalSize) * 100)
+            Math.round((totalUploaded / totalSize) * 100),
           );
         },
         (error) => {
@@ -129,7 +129,7 @@ function handleMultiUpload(files, options = {}) {
             .catch((error) => {
               reject(error);
             });
-        }
+        },
       );
     });
   });

diff --git a/src/pages/PostView/index.jsx b/src/pages/PostView/index.jsx
@@ -13,7 +13,7 @@ const PostView = (props) => {
   const [post, setPost] = useState(null);
   const [loading, setLoading] = useState(true);
   const [fetchAgain, setFetchAgain] = useState(false);
-  
+
   useEffect(() => {
     setLoading(true);
     if (loading) {

diff --git a/src/pages/Profile/index.jsx b/src/pages/Profile/index.jsx
@@ -44,8 +44,7 @@ function Profile() {
   const [name, setName] = useState("");
   const [email, setEmail] = useState("");
   const [avatar, setAvatar] = useState("");
-
-  let uid = location?.state?.uid || user?.uid;
+  const [uid, setUid] = useState(location?.state?.uid || null);
 
   const handleClose = () => setOpen(false);
 
@@ -150,9 +149,9 @@ function Profile() {
         setEmail(
           location?.state?.name === authUser?.displayName
             ? location?.state?.email || authUser.email
-            : ""
+            : "",
         );
-        uid = location?.state?.uid || authUser.uid;
+        setUid(location?.state?.uid || authUser.uid);
       } else {
         navigate("/dummygram/login");
       }
@@ -167,7 +166,7 @@ function Profile() {
   useEffect(() => {
     const usernameQ = query(
       collection(db, "users"),
-      where("uid", "==", auth.currentUser.uid)
+      where("uid", "==", auth.currentUser.uid),
     );
     const unsubscribe = onSnapshot(usernameQ, (querySnapshot) => {
       querySnapshot.forEach((doc) => {
@@ -180,7 +179,7 @@ function Profile() {
   useEffect(() => {
     const q = query(
       collection(db, "posts"),
-      where("username", "==", location?.state?.name || name)
+      where("username", "==", location?.state?.name || name),
     );
     const unsubscribe = onSnapshot(q, (querySnapshot) => {
       const userPosts = [];
@@ -233,7 +232,7 @@ function Profile() {
               variant: "success",
             });
           });
-      }
+      },
     );
     setVisible(false);
   };