fix reloading issue, when user click refresh button it shows 404 page. (

#1260) * fix reloading issue * fix: routes base dummygram --------- Co-authored-by: narayan soni <[email protected]>
narayan954 · Sep 18, 2023 · b050394 · b050394
1 parent daafee0
commit b050394
Show file tree

Hide file tree

Showing 42 changed files with 120 additions and 129 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/App.jsx b/src/App.jsx
@@ -103,7 +103,7 @@ function App() {
         setUser(authUser);
       } else {
         setUser(null);
-        navigate("/dummygram/login");
+        navigate("/login");
       }
     });
     return () => {
@@ -116,7 +116,7 @@ function App() {
       <ErrorBoundary inApp={true}>
         <Routes>
           <Route
-            path="/dummygram"
+            path="/"
             element={
               <ErrorBoundary inApp={true}>
                 <Wrapper
@@ -322,10 +322,10 @@ function Wrapper({ user, setUser, setRowMode }) {
   }, []);
 
   const isCenteredScroll =
-    location.pathname === "/dummygram/favourites" ||
-    location.pathname === "/dummygram/about" ||
-    location.pathname === "/dummygram/guidelines" ||
-    location.pathname === "/dummygram/contributors";
+    location.pathname === "/favourites" ||
+    location.pathname === "/about" ||
+    location.pathname === "/guidelines" ||
+    location.pathname === "/contributors";
 
   return (
     <div className="app">
@@ -334,8 +334,7 @@ function Wrapper({ user, setUser, setRowMode }) {
         user={user}
         setUser={setUser}
       />
-      {(location.pathname == "/dummygram/login" ||
-        location.pathname == "/dummygram/signup") && (
+      {(location.pathname == "/login" || location.pathname == "/signup") && (
         <Darkmode themeClass="themeButton themeButton-login" />
       )}
 

diff --git a/src/components/CommunityChat/index.jsx b/src/components/CommunityChat/index.jsx
@@ -129,7 +129,7 @@ const ChatBox = () => {
       docRef
         .get()
         .then((doc) => {
-          navigate(`/dummygram/user/${doc.data().username}`);
+          navigate(`/user/${doc.data().username}`);
         })
         .catch((error) => {
           enqueueSnackbar(`Error Occured: ${error}`, {
@@ -185,7 +185,7 @@ const ChatBox = () => {
       if (user) {
         setUser(user);
       } else {
-        navigate("/dummygram/login");
+        navigate("/login");
       }
     });
 
@@ -268,7 +268,7 @@ const ChatBox = () => {
     <>
       <div className="chat-main-container">
         <div className="closeBtn">
-          <HighlightOffRoundedIcon onClick={() => navigate("/dummygram/")} />
+          <HighlightOffRoundedIcon onClick={() => navigate("/")} />
         </div>
 
         {isLoading ? (

diff --git a/src/components/EditProfile/index.jsx b/src/components/EditProfile/index.jsx
@@ -206,7 +206,7 @@ const EditProfile = ({ userData, username, setIsEditing, setUserData }) => {
         await updateUser(oldImg)
           .then(() => {
             setUserData(editedData);
-            navigate(`/dummygram/user/${newUsername}`);
+            navigate(`/user/${newUsername}`);
             playSuccessSound();
             enqueueSnackbar("Upload Successfull", {
               variant: "success",

diff --git a/src/components/FriendsComponent/Locked/index.jsx b/src/components/FriendsComponent/Locked/index.jsx
@@ -12,8 +12,8 @@ const LockedFriendPage = ({ name }) => {
         className="profile_lock_img"
       />
       <h3>
-        Add <Link to={`/dummygram/user/${name}`}>{name}</Link> as friend to
-        unlock their friend list!
+        Add <Link to={`/user/${name}`}>{name}</Link> as friend to unlock their
+        friend list!
       </h3>
     </div>
   );

diff --git a/src/components/FriendsComponent/index.jsx b/src/components/FriendsComponent/index.jsx
@@ -93,12 +93,12 @@ const FriendsComponent = () => {
                       src={photoURL ? photoURL : blankImg}
                       alt={"user pic"}
                       className="friend_page_friend_avatar"
-                      onClick={() => navigate(`/dummygram/user/${username}`)}
+                      onClick={() => navigate(`/user/${username}`)}
                     />
                     <div>
                       <h3
                         className="friend_page_friend_name"
-                        onClick={() => navigate(`/dummygram/user/${username}`)}
+                        onClick={() => navigate(`/user/${username}`)}
                       >
                         {displayName ? displayName : "user"}
                       </h3>

diff --git a/src/components/Guest/GuestSignInBtn/index.jsx b/src/components/Guest/GuestSignInBtn/index.jsx
@@ -20,7 +20,7 @@ const GuestSignInBtn = ({ show }) => {
         enqueueSnackbar("Guest Sign In successfull", {
           variant: "success",
         });
-        navigate("/dummygram");
+        navigate("/");
       })
       .catch((error) => {
         playErrorSound();

diff --git a/src/components/Guest/GuestSignUpBtn/index.jsx b/src/components/Guest/GuestSignUpBtn/index.jsx
@@ -8,7 +8,7 @@ const GuestSignUpBtn = () => {
     <div className="guest-sign-up-button-container">
       <button
         className="guest-sign-up-button"
-        onClick={() => navigate("/dummygram/signup")}
+        onClick={() => navigate("/signup")}
       >
         Sign Up
       </button>

diff --git a/src/components/Navbar/index.jsx b/src/components/Navbar/index.jsx
@@ -87,7 +87,7 @@ function Navbar({ onClick, user, setUser }) {
         setUser(authUser);
       } else {
         setUser(null);
-        navigate("/dummygram/login");
+        navigate("/login");
       }
     });
     return () => {
@@ -96,15 +96,15 @@ function Navbar({ onClick, user, setUser }) {
   }, [user]);
 
   return (
-    location.pathname !== "/dummygram/login" &&
-    location.pathname !== "/dummygram/signup" && (
+    location.pathname !== "/login" &&
+    location.pathname !== "/signup" && (
       <div className="app__header">
         {windowWidth > 600 ? (
           <span className="nav_text_logo">
             <Logo />
           </span>
         ) : (
-          <span onClick={() => navigate("/dummygram")}>
+          <span onClick={() => navigate("/")}>
             <img src={appLogo} alt="dummygram" className="nav_img_logo" />
           </span>
         )}
@@ -149,7 +149,7 @@ function Navbar({ onClick, user, setUser }) {
                         key={id}
                         className="searched_user_li"
                         onClick={() =>
-                          navigate(`/dummygram/user/${user.username}`)
+                          navigate(`/user/${user.username}`)
                         }
                       >
                         <img
@@ -184,7 +184,7 @@ function Navbar({ onClick, user, setUser }) {
             <div
               className="rowConvert"
               id="chat-icon"
-              onClick={() => navigate("/dummygram/chat")}
+              onClick={() => navigate("/chat")}
             >
               <ChatIcon className="chatIcon" />
             </div>

diff --git a/src/components/Notification/index.jsx b/src/components/Notification/index.jsx
@@ -1,13 +1,13 @@
 import "./index.css";
 
-import { Loader } from "../../reusableComponents";
 import React, { useEffect, useState } from "react";
 import { auth, db } from "../../lib/firebase";
-import firebase from "firebase/compat/app";
 
 import { Box } from "@mui/material";
 import { Link } from "react-router-dom";
+import { Loader } from "../../reusableComponents";
 import { SideBar } from "../index";
+import firebase from "firebase/compat/app";
 import { useSnackbar } from "notistack";
 
 function Notifications() {
@@ -161,7 +161,7 @@ function Notifications() {
                           {message} from{" "}
                           <Link
                             className="friend-request-sender-name"
-                            to={`/dummygram/user/${username ? username : ""}`}
+                            to={`/user/${username ? username : ""}`}
                           >
                             {name ? name : ""}.
                           </Link>

diff --git a/src/components/Post/CommentBox.jsx b/src/components/Post/CommentBox.jsx
@@ -68,7 +68,7 @@ const CommentBox = ({
             disabled={comment.trim().length < 1}
             type="submit"
             onClick={(e) =>
-              isAnonymous ? navigate("/dummygram/signup") : postComment(e)
+              isAnonymous ? navigate("/signup") : postComment(e)
             }
             style={{
               padding: 0,

diff --git a/src/components/Post/CommentDialogBox.jsx b/src/components/Post/CommentDialogBox.jsx
@@ -62,7 +62,7 @@ const CommentDialogBox = ({ postId, comments, user, fullScreen }) => {
                 <div>
                   <Link
                     className="comment-doer"
-                    to={`/dummygram/${
+                    to={`/${
                       isAnonymous
                         ? "signup"
                         : `user/${userComment.content.username}`

diff --git a/src/components/Post/LikesDialogBox.jsx b/src/components/Post/LikesDialogBox.jsx
@@ -15,7 +15,7 @@ const trimBio = (bio, maxLength = 90) => {
 
 const renderUser = ({ uid, username, photoURL, name, bio }) => (
   <div key={uid} className="likedby_list_item">
-    <Link to={`/dummygram/user/${username}`} style={{ color: "var(--color)" }}>
+    <Link to={`/user/${username}`} style={{ color: "var(--color)" }}>
       <img
         src={photoURL ? photoURL : blankProfileImg}
         alt={name}
@@ -25,7 +25,7 @@ const renderUser = ({ uid, username, photoURL, name, bio }) => (
     <div>
       <section className="like_user_data">
         <Link
-          to={`/dummygram/user/${username}`}
+          to={`/user/${username}`}
           style={{ textDecoration: "none" }}
         >
           <h3 className="like_user_name">{name}</h3>

diff --git a/src/components/Post/PostHeader.jsx b/src/components/Post/PostHeader.jsx
@@ -131,9 +131,7 @@ const PostHeader = ({ postId, user, postData, postHasImages, timestamp }) => {
         alt={displayName}
         src={avatar}
         onClick={() =>
-          navigate(
-            "/dummygram/" + (isAnonymous ? "signup" : "user/" + username),
-          )
+          navigate("/" + (isAnonymous ? "signup" : "user/" + username))
         }
         onMouseEnter={showProfileDialogBox}
         onMouseLeave={hideProfileDialogBox}
@@ -145,9 +143,7 @@ const PostHeader = ({ postId, user, postData, postHasImages, timestamp }) => {
       <div className="header-data">
         <h3
           onClick={() => {
-            navigate(
-              "/dummygram/" + (isAnonymous ? "signup" : "posts/" + postId),
-            );
+            navigate("/" + (isAnonymous ? "signup" : "posts/" + postId));
           }}
           className="post__username"
         >
@@ -156,7 +152,7 @@ const PostHeader = ({ postId, user, postData, postHasImages, timestamp }) => {
         <p className="post__time">{time}</p>
       </div>
       <div className="social__icon__last">
-        {!location.pathname.includes("/dummygram/user") && (
+        {!location.pathname.includes("/user") && (
           <IconButton
             aria-label="more"
             id="long-button"
@@ -165,7 +161,7 @@ const PostHeader = ({ postId, user, postData, postHasImages, timestamp }) => {
             aria-haspopup="true"
             onClick={(event) =>
               isAnonymous
-                ? navigate("/dummygram/signup")
+                ? navigate("/signup")
                 : setAnchorEl(event.currentTarget)
             }
             sx={{
@@ -200,7 +196,7 @@ const PostHeader = ({ postId, user, postData, postHasImages, timestamp }) => {
           {postHasImages && (
             <MenuItem onClick={handleDownload}> Download </MenuItem>
           )}
-          <MenuItem onClick={() => navigate(`/dummygram/user/${username}`)}>
+          <MenuItem onClick={() => navigate(`/user/${username}`)}>
             Visit Profile
           </MenuItem>
         </Menu>

diff --git a/src/components/Post/PostNav.jsx b/src/components/Post/PostNav.jsx
@@ -33,7 +33,7 @@ const PostNav = ({
 
   const handleOnClick = async () => {
     if (isAnonymous) {
-      navigate("/dummygram/signup");
+      navigate("/signup");
     } else {
       try {
         const data = await savePost(postId);
@@ -50,7 +50,7 @@ const PostNav = ({
         <Flexbetween
           sx={{ cursor: "pointer" }}
           onClick={() =>
-            isAnonymous ? navigate("/dummygram/signup") : likesHandler()
+            isAnonymous ? navigate("/signup") : likesHandler()
           }
         >
           <IconButton>
@@ -75,7 +75,7 @@ const PostNav = ({
           sx={{ cursor: "pointer" }}
           onClick={() => {
             isAnonymous
-              ? navigate("/dummygram/signup")
+              ? navigate("/signup")
               : setisCommentOpen(true);
           }}
         >
@@ -93,7 +93,7 @@ const PostNav = ({
           sx={{ cursor: "pointer" }}
           onClick={() => {
             if (isAnonymous) {
-              navigate("/dummygram/signup");
+              navigate("/signup");
             } else {
               setOpenShareModal((prev) => !prev);
             }

diff --git a/src/components/ProfileDialogBox/index.jsx b/src/components/ProfileDialogBox/index.jsx
@@ -40,15 +40,15 @@ const ProfileDialogBox = ({ mouseOnProfileImg, userData }) => {
           src={avatar ? avatar : profileAvatar}
           alt={name}
           className="dialog-box-img"
-          onClick={() => navigate(`/dummygram/user/${username}`)}
+          onClick={() => navigate(`/user/${username}`)}
         />
         <div
           className="dialog-box-name-container"
           style={{ marginTop: "10px" }}
         >
           <h4
             className="dialog-box-display-name"
-            onClick={() => navigate(`/dummygram/user/${username}`)}
+            onClick={() => navigate(`/user/${username}`)}
           >
             {name}
           </h4>

diff --git a/src/components/ReadMore/index.jsx b/src/components/ReadMore/index.jsx
@@ -25,7 +25,7 @@ const ReadMore = ({ children, postId, picCap = false, readMore = true }) => {
           onClick={() => {
             toggleReadMore();
             if (!id) {
-              navigate(`/dummygram/posts/${postId}`);
+              navigate(`/posts/${postId}`);
             }
           }}
           style={{

diff --git a/src/components/SettingsComponents/DeleteAccount/index.jsx b/src/components/SettingsComponents/DeleteAccount/index.jsx
@@ -115,7 +115,7 @@ const DeleteAccount = ({ user }) => {
       await Promise.all(deleteImagePromises);
 
       localStorage.removeItem("user");
-      navigate("/dummygram/login");
+      navigate("/login");
       enqueueSnackbar("User deleted successfully", {
         variant: "success",
       });