From 6f539ddb4a1c72e287700a500dee0c3038c794b2 Mon Sep 17 00:00:00 2001 From: Roman Ojha Date: Sun, 29 May 2022 22:42:18 +0545 Subject: [PATCH] fix(axios): handling response error on client --- client/src/components/CommentBox.jsx | 12 ++-- client/src/components/FollowedBy.jsx | 18 +++-- .../HomePage/DisplayFollowedUserPost.jsx | 11 +-- .../HomePage/MaxViewPostField/PostButton.jsx | 6 +- .../src/components/MainPageMsgAndNtfBar.jsx | 12 ++-- .../MainPageStoryComp/MainPageStory.jsx | 1 - .../MessageBox/MessagesListSingleMessage.jsx | 68 ++++++++++--------- .../components/MessagePage/MessagesList.jsx | 6 +- .../MessagePage/MessagesListSingleMessage.jsx | 6 +- .../MessagePage/SendMessageInputField.jsx | 3 +- .../src/components/PostBox/CommentField.jsx | 6 +- .../src/components/PostBox/CommentedUser.jsx | 6 +- .../components/PostBox/LikeCommentShare.jsx | 12 ++-- client/src/components/PostBox/PostInfo.jsx | 6 +- client/src/components/ProfileFriends.jsx | 24 ++++--- .../src/components/ProfilePage/UserInfo.jsx | 18 +++-- .../src/components/ProfilePage/UserPosts.jsx | 6 +- client/src/components/SideBar/Account.jsx | 6 +- client/src/components/SideBar/Friends.jsx | 14 ++-- .../components/SideBar/LogoAndSearchBar.jsx | 6 +- client/src/components/SideBar/Menu.jsx | 6 +- client/src/components/SideBar/SearchBar.jsx | 8 +++ .../UserSuggestionComp/SuggestedUser.jsx | 18 +++-- .../src/components/VideoPage/SearchForm.jsx | 6 +- client/src/pages/GetUserID.js | 6 +- client/src/pages/Index.js | 6 +- client/src/pages/Profile.js | 6 +- client/src/pages/Setting.js | 32 +++++++-- client/src/pages/SignIn.js | 8 ++- client/src/pages/SignUp.js | 6 +- client/src/pages/Video.js | 6 +- 31 files changed, 233 insertions(+), 122 deletions(-) diff --git a/client/src/components/CommentBox.jsx b/client/src/components/CommentBox.jsx index c6381897..e66926d1 100644 --- a/client/src/components/CommentBox.jsx +++ b/client/src/components/CommentBox.jsx @@ -91,8 +91,10 @@ const ReturnCommentContent = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -128,8 +130,10 @@ const ReturnCommentContent = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/FollowedBy.jsx b/client/src/components/FollowedBy.jsx index 6158904c..8519ec33 100644 --- a/client/src/components/FollowedBy.jsx +++ b/client/src/components/FollowedBy.jsx @@ -61,8 +61,10 @@ const FollowedBy = () => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -103,8 +105,10 @@ const FollowedBy = () => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -135,8 +139,10 @@ const FollowedBy = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/HomePage/DisplayFollowedUserPost.jsx b/client/src/components/HomePage/DisplayFollowedUserPost.jsx index 6b9dc924..f162eb81 100644 --- a/client/src/components/HomePage/DisplayFollowedUserPost.jsx +++ b/client/src/components/HomePage/DisplayFollowedUserPost.jsx @@ -27,12 +27,13 @@ const DisplayFollowedUserPost = () => { /> ); }); - if ( - followedUserPostDataStore.length === 1 && - postElement[0].props.userMainInformation.userID === + if (followedUserPostDataStore.length === 1 && postElement[0]) { + if ( + postElement[0].props.userMainInformation.userID === admin.adminUserID - ) { - return [, ...postElement]; + ) { + return [, ...postElement]; + } } else if (postElement.length > 0) { return postElement; } else { diff --git a/client/src/components/HomePage/MaxViewPostField/PostButton.jsx b/client/src/components/HomePage/MaxViewPostField/PostButton.jsx index de8a8d6d..2b70201c 100644 --- a/client/src/components/HomePage/MaxViewPostField/PostButton.jsx +++ b/client/src/components/HomePage/MaxViewPostField/PostButton.jsx @@ -46,8 +46,10 @@ const PostButton = () => { dispatch(showLoadingSpinner(false)); dispatch(setHomePagePostFieldViewValue("min")); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/MainPageMsgAndNtfBar.jsx b/client/src/components/MainPageMsgAndNtfBar.jsx index 44062ada..cbb0f7dd 100644 --- a/client/src/components/MainPageMsgAndNtfBar.jsx +++ b/client/src/components/MainPageMsgAndNtfBar.jsx @@ -57,8 +57,10 @@ const MainPageMsgAndNtfBar = () => { toastError(data.msg); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -82,8 +84,10 @@ const MainPageMsgAndNtfBar = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/MainPageStoryComp/MainPageStory.jsx b/client/src/components/MainPageStoryComp/MainPageStory.jsx index 32ecf8b0..ddb95c85 100644 --- a/client/src/components/MainPageStoryComp/MainPageStory.jsx +++ b/client/src/components/MainPageStoryComp/MainPageStory.jsx @@ -8,7 +8,6 @@ import FriendStory from "./FriendStory"; const MainPageStory = () => { const userStoriesStore = useSelector((state) => state.userStoriesReducer); // console.log(userStoriesStore); - const storiesData = userStoriesStore.data; const isMobile = useMediaQuery({ query: "(max-width: 480px)", }); diff --git a/client/src/components/MessageBox/MessagesListSingleMessage.jsx b/client/src/components/MessageBox/MessagesListSingleMessage.jsx index 97f88245..8d3359cb 100644 --- a/client/src/components/MessageBox/MessagesListSingleMessage.jsx +++ b/client/src/components/MessageBox/MessagesListSingleMessage.jsx @@ -1,54 +1,58 @@ import React from "react"; import User_Profile_Icon from "../../assets/svg/User_profile_Icon.svg"; -import socket from "../../services/socket"; import { currentUserMessageAction, mainPageMessageInnerViewOnOff, } from "../../services/redux-actions/index"; import { useDispatch } from "react-redux"; import { instance as axios } from "../../services/axios"; +import { toastError } from "../../services/toast"; const MessagesListSingleMessage = (props) => { const dispatch = useDispatch(); const showInnerMessage = async () => { - // before getting new message we will reset the previous message stored into redux - dispatch( - currentUserMessageAction({ - messageToId: props.messageInfo.messageToId, - messageToUserId: props.messageInfo.messageToUserId, - receiverPicture: props.messageInfo.receiverPicture, - message: [], - fetchedInnerMessage: false, - }) - ); - dispatch(mainPageMessageInnerViewOnOff(true)); - const resMessage = await axios({ - // sending receiver userID to get message data of that user - method: "POST", - url: "/u/getMessage", - headers: { - "Content-Type": "application/json", - }, - data: JSON.stringify({ - userID: props.messageInfo.messageToUserId, - id: props.messageInfo.messageToId, - }), - withCredentials: true, - }); - if (resMessage.status !== 200) { - const error = await resMessage.data; - } else { - const resData = await resMessage.data; - // after getting message we will store that message into redux + try { + // before getting new message we will reset the previous message stored into redux dispatch( currentUserMessageAction({ messageToId: props.messageInfo.messageToId, messageToUserId: props.messageInfo.messageToUserId, receiverPicture: props.messageInfo.receiverPicture, - message: resData.message, - fetchedInnerMessage: true, + message: [], + fetchedInnerMessage: false, }) ); + dispatch(mainPageMessageInnerViewOnOff(true)); + const resMessage = await axios({ + // sending receiver userID to get message data of that user + method: "POST", + url: "/u/getMessage", + headers: { + "Content-Type": "application/json", + }, + data: JSON.stringify({ + userID: props.messageInfo.messageToUserId, + id: props.messageInfo.messageToId, + }), + withCredentials: true, + }); + if (resMessage.status !== 200) { + const error = await resMessage.data; + } else { + const resData = await resMessage.data; + // after getting message we will store that message into redux + dispatch( + currentUserMessageAction({ + messageToId: props.messageInfo.messageToId, + messageToUserId: props.messageInfo.messageToUserId, + receiverPicture: props.messageInfo.receiverPicture, + message: resData.message, + fetchedInnerMessage: true, + }) + ); + } + } catch (err) { + toastError("Some Problem Occur, Please Try again later!!!"); } }; diff --git a/client/src/components/MessagePage/MessagesList.jsx b/client/src/components/MessagePage/MessagesList.jsx index a257526d..48c7ff59 100644 --- a/client/src/components/MessagePage/MessagesList.jsx +++ b/client/src/components/MessagePage/MessagesList.jsx @@ -24,8 +24,10 @@ const MessagesList = () => { } setShowLoadingSpinner(false); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/MessagePage/MessagesListSingleMessage.jsx b/client/src/components/MessagePage/MessagesListSingleMessage.jsx index 8d1f30f3..4a0a2cbd 100644 --- a/client/src/components/MessagePage/MessagesListSingleMessage.jsx +++ b/client/src/components/MessagePage/MessagesListSingleMessage.jsx @@ -53,8 +53,10 @@ const MessageListSingleMessage = (props) => { ); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/MessagePage/SendMessageInputField.jsx b/client/src/components/MessagePage/SendMessageInputField.jsx index 95e5de44..0187da1b 100644 --- a/client/src/components/MessagePage/SendMessageInputField.jsx +++ b/client/src/components/MessagePage/SendMessageInputField.jsx @@ -7,6 +7,7 @@ import { } from "../../services/redux-actions/index"; import { Icon } from "@iconify/react"; import { isEmptyString } from "../../funcs/isEmptyString"; +import { toastError } from "../../services/toast"; const SendMessageInputField = (props) => { const dispatch = useDispatch(); @@ -57,7 +58,7 @@ const SendMessageInputField = (props) => { } }); } catch (err) { - // console.log(err); + toastError("Some Problem Occur, Please Try again later!!!"); } }; diff --git a/client/src/components/PostBox/CommentField.jsx b/client/src/components/PostBox/CommentField.jsx index 3e17d933..6ab68991 100644 --- a/client/src/components/PostBox/CommentField.jsx +++ b/client/src/components/PostBox/CommentField.jsx @@ -55,8 +55,10 @@ const CommentField = (props) => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/PostBox/CommentedUser.jsx b/client/src/components/PostBox/CommentedUser.jsx index d57aabbd..25a33b6d 100644 --- a/client/src/components/PostBox/CommentedUser.jsx +++ b/client/src/components/PostBox/CommentedUser.jsx @@ -47,8 +47,10 @@ const CommentedUser = (props) => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/PostBox/LikeCommentShare.jsx b/client/src/components/PostBox/LikeCommentShare.jsx index 65421df9..af1d6168 100644 --- a/client/src/components/PostBox/LikeCommentShare.jsx +++ b/client/src/components/PostBox/LikeCommentShare.jsx @@ -46,8 +46,10 @@ const LikeCommentShare = (props) => { }); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -80,8 +82,10 @@ const LikeCommentShare = (props) => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/PostBox/PostInfo.jsx b/client/src/components/PostBox/PostInfo.jsx index 782a2759..2d2dd8b3 100644 --- a/client/src/components/PostBox/PostInfo.jsx +++ b/client/src/components/PostBox/PostInfo.jsx @@ -85,8 +85,10 @@ const PostInfo = (props) => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/ProfileFriends.jsx b/client/src/components/ProfileFriends.jsx index f7d4aad8..04ebddee 100644 --- a/client/src/components/ProfileFriends.jsx +++ b/client/src/components/ProfileFriends.jsx @@ -60,10 +60,12 @@ const ProfileFriends = () => { toastError("Some Error Occur While Fetching Friends Data"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { - toastError("Some Problem Occur while fetching friends data"); + toastError("Some Problem Occur, Please Try again later!!!"); } } }; @@ -82,10 +84,12 @@ const ProfileFriends = () => { toastError("Some Error Occur While Fetching Friends Data"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { - toastError("Some Problem Occur while fetching friends data"); + toastError("Some Problem Occur, Please Try again later!!!"); } } }; @@ -104,10 +108,12 @@ const ProfileFriends = () => { toastError("Some Error Occur While Fetching Friends Data"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { - toastError("Some Problem Occur while fetching friends data"); + toastError("Some Problem Occur, Please Try again later!!!"); } } }; diff --git a/client/src/components/ProfilePage/UserInfo.jsx b/client/src/components/ProfilePage/UserInfo.jsx index d1969242..56aa8383 100644 --- a/client/src/components/ProfilePage/UserInfo.jsx +++ b/client/src/components/ProfilePage/UserInfo.jsx @@ -58,8 +58,10 @@ const UserInfo = () => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -95,8 +97,10 @@ const UserInfo = () => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -150,8 +154,10 @@ const UserInfo = () => { ); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/ProfilePage/UserPosts.jsx b/client/src/components/ProfilePage/UserPosts.jsx index 385f4a29..dbaa1657 100644 --- a/client/src/components/ProfilePage/UserPosts.jsx +++ b/client/src/components/ProfilePage/UserPosts.jsx @@ -36,8 +36,10 @@ const UserPosts = (props) => { ); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/SideBar/Account.jsx b/client/src/components/SideBar/Account.jsx index b97e5435..39b7733a 100644 --- a/client/src/components/SideBar/Account.jsx +++ b/client/src/components/SideBar/Account.jsx @@ -38,8 +38,10 @@ const Account = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/SideBar/Friends.jsx b/client/src/components/SideBar/Friends.jsx index 90e5ddd6..4c1281a2 100644 --- a/client/src/components/SideBar/Friends.jsx +++ b/client/src/components/SideBar/Friends.jsx @@ -48,8 +48,10 @@ const Friends = () => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -155,10 +157,12 @@ const Friends = () => { toastError("Some Error Occur While Fetching Friends Data"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { - toastError("Some Problem Occur while fetching friends data"); + toastError("Some Problem Occur, Please Try again later!!!"); } } }; diff --git a/client/src/components/SideBar/LogoAndSearchBar.jsx b/client/src/components/SideBar/LogoAndSearchBar.jsx index 53a4ff54..96c3629f 100644 --- a/client/src/components/SideBar/LogoAndSearchBar.jsx +++ b/client/src/components/SideBar/LogoAndSearchBar.jsx @@ -20,8 +20,10 @@ const LogoAndSearchBar = (props) => { const resUser = await res.data; setUserSearchResult(resUser); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/SideBar/Menu.jsx b/client/src/components/SideBar/Menu.jsx index 9452f9e2..4b9a126d 100644 --- a/client/src/components/SideBar/Menu.jsx +++ b/client/src/components/SideBar/Menu.jsx @@ -40,8 +40,10 @@ const Menu = () => { toastError("Some this went wrong please try again later"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/SideBar/SearchBar.jsx b/client/src/components/SideBar/SearchBar.jsx index c781d4fb..aa2549f3 100644 --- a/client/src/components/SideBar/SearchBar.jsx +++ b/client/src/components/SideBar/SearchBar.jsx @@ -9,6 +9,7 @@ import { } from "../../services/redux-actions"; import { instance as axios } from "../../services/axios"; import "../../styles/components/mainPageSearchBar.css"; +import { toastError } from "../../services/toast"; const MainPageSearchBar = (props) => { const history = useHistory(); @@ -50,6 +51,13 @@ const MainPageSearchBar = (props) => { history.push(`/u/profile/${props.userDetail.userID}/posts`); } } catch (err) { + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } + } else { + toastError("Some Problem Occur, Please Try again later!!!"); + } dispatch(stopProgressBar()); } }} diff --git a/client/src/components/UserSuggestionComp/SuggestedUser.jsx b/client/src/components/UserSuggestionComp/SuggestedUser.jsx index 0dabc808..e333b4ca 100644 --- a/client/src/components/UserSuggestionComp/SuggestedUser.jsx +++ b/client/src/components/UserSuggestionComp/SuggestedUser.jsx @@ -52,8 +52,10 @@ const SuggestedUser = (props) => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -94,8 +96,10 @@ const SuggestedUser = (props) => { dispatch(stopProgressBar()); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } @@ -128,8 +132,10 @@ const SuggestedUser = (props) => { } dispatch(stopProgressBar()); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/components/VideoPage/SearchForm.jsx b/client/src/components/VideoPage/SearchForm.jsx index 977f753d..adc03135 100644 --- a/client/src/components/VideoPage/SearchForm.jsx +++ b/client/src/components/VideoPage/SearchForm.jsx @@ -36,8 +36,10 @@ const SearchForm = () => { } form.current.reset(); } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/pages/GetUserID.js b/client/src/pages/GetUserID.js index b21b148a..9db68e5e 100644 --- a/client/src/pages/GetUserID.js +++ b/client/src/pages/GetUserID.js @@ -77,8 +77,10 @@ const GetUserID = (props) => { } } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.err); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.err); + } } else { toastError("Some Problem Occur, Please Try again Letter!!!"); } diff --git a/client/src/pages/Index.js b/client/src/pages/Index.js index 46decae7..73e7610d 100644 --- a/client/src/pages/Index.js +++ b/client/src/pages/Index.js @@ -81,8 +81,10 @@ const Index = () => { } catch (err) { // toastError("Some Problem Occur, Please Try again later!!!"); history.push("/signin"); - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/pages/Profile.js b/client/src/pages/Profile.js index 3f481992..4c66adac 100644 --- a/client/src/pages/Profile.js +++ b/client/src/pages/Profile.js @@ -71,8 +71,10 @@ const Profile = () => { ); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/pages/Setting.js b/client/src/pages/Setting.js index e5950b89..b36e35e7 100644 --- a/client/src/pages/Setting.js +++ b/client/src/pages/Setting.js @@ -59,7 +59,13 @@ const Setting = () => { userID: "", }); } catch (err) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } + } else { + toastError("Some Problem Occur, Please Try again later!!!"); + } dispatch(stopProgressBar()); } }; @@ -81,7 +87,13 @@ const Setting = () => { name: "", }); } catch (err) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } + } else { + toastError("Some Problem Occur, Please Try again later!!!"); + } dispatch(stopProgressBar()); } }; @@ -104,7 +116,13 @@ const Setting = () => { cNewPassword: "", }); } catch (err) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } + } else { + toastError("Some Problem Occur, Please Try again later!!!"); + } dispatch(stopProgressBar()); } }; @@ -154,7 +172,13 @@ const Setting = () => { } setSettingInputFieldData({ ...settingInputFieldData, imgUrl: "" }); } catch (err) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } + } else { + toastError("Some Problem Occur, Please Try again later!!!"); + } dispatch(showLoadingSpinner(false)); } setSettingInputFieldData({ diff --git a/client/src/pages/SignIn.js b/client/src/pages/SignIn.js index acdfa220..94297c81 100644 --- a/client/src/pages/SignIn.js +++ b/client/src/pages/SignIn.js @@ -57,10 +57,12 @@ const SignIn = () => { history.push("/u/home"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { - toastError("Some Problem Occur, Please Try again Letter!!!"); + toastError("Some Problem Occur, Please Try again later!!!"); } dispatch(stopProgressBar()); } diff --git a/client/src/pages/SignUp.js b/client/src/pages/SignUp.js index 2bd41948..b7a3a768 100644 --- a/client/src/pages/SignUp.js +++ b/client/src/pages/SignUp.js @@ -136,8 +136,10 @@ const SignUp = () => { toastError(data.msg); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); } diff --git a/client/src/pages/Video.js b/client/src/pages/Video.js index e9723067..19ad452a 100644 --- a/client/src/pages/Video.js +++ b/client/src/pages/Video.js @@ -49,8 +49,10 @@ const Video = () => { toastError("Some thing went wrong, please try again later!!!"); } } catch (err) { - if (err.response.data.success === false) { - toastError(err.response.data.msg); + if (err.response) { + if (err.response.data.success === false) { + toastError(err.response.data.msg); + } } else { toastError("Some Problem Occur, Please Try again later!!!"); }