External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix react-toastify mounting error

Browse Source
This commit is contained in:
plebbitor
2023-04-04 14:42:22 +02:00
parent a63471aff6
commit 551b7de14d
7 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/views/Board.jsx
+17 -8
View File
@@ -15,10 +15,10 @@ import SettingsModal from '../SettingsModal';
import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
import getDate from '../../utils/getDate';
import handleStyleChange from '../../utils/handleStyleChange';
import onError from '../../utils/onError';
import onSuccess from '../../utils/onSuccess';
import renderComments from '../../utils/renderComments';
import useClickForm from '../../hooks/useClickForm';
import useError from '../../hooks/useError';
import useSuccess from '../../hooks/useSuccess';
const Board = () => {
@@ -49,6 +49,11 @@ const Board = () => {
const [selectedFeed, setSelectedFeed] = useState(feed);
const { subplebbitAddress } = useParams();
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
// useEffect(() => {
// console.log(selectedFeed[3]);
@@ -93,11 +98,13 @@ const Board = () => {
const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) {
onSuccess('challenge success', {publishedCid: challengeVerification.publication.cid})
setSuccessMessage('challenge success', {publishedCid: challengeVerification.publication.cid});
setSelectedThread(challengeVerification.publication.cid);
navigate(`/${selectedAddress}/thread/${challengeVerification.publication.cid}`);
}
else if (challengeVerification.challengeSuccess === false) {
onError('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
onError("Error: You seem to have mistyped the CAPTCHA. Please try again.");
setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
}
}
@@ -109,7 +116,7 @@ const Board = () => {
challengeAnswers = await getChallengeAnswersFromUser(challenges)
}
catch (error) {
onError(error);
setErrorMessage(error);
}
if (challengeAnswers) {
await comment.publishChallengeAnswers(challengeAnswers)
@@ -125,7 +132,9 @@ const Board = () => {
subplebbitAddress: selectedAddress,
onChallenge,
onChallengeVerification,
onError
onError: (error) => {
setErrorMessage(error);
}
};
@@ -166,7 +175,7 @@ const Board = () => {
};
challengeImg.onerror = () => {
reject(onError('Could not load challenge image'));
reject(setErrorMessage('Could not load challenge image'));
};
});
};
src/components/views/Catalog.jsx
+12 -8
View File
@@ -14,9 +14,9 @@ import Post from '../Post';
import SettingsModal from '../SettingsModal';
import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
import handleStyleChange from '../../utils/handleStyleChange';
import onError from '../../utils/onError';
import onSuccess from '../../utils/onSuccess';
import useClickForm from '../../hooks/useClickForm';
import useError from '../../hooks/useError';
import useSuccess from '../../hooks/useSuccess';
const Catalog = () => {
@@ -45,6 +45,11 @@ const Catalog = () => {
const { feed, hasMore, loadMore } = useFeed({subplebbitAddresses: [`${selectedAddress}`], sortType: 'new'});
const { subplebbitAddress } = useParams();
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
// temporary title from JSON, gets subplebbitAddress from URL
useEffect(() => {
setSelectedAddress(subplebbitAddress);
@@ -77,11 +82,11 @@ const Catalog = () => {
const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) {
onSuccess('challenge success', {publishedCid: challengeVerification.publication.cid})
setSuccessMessage('challenge success', {publishedCid: challengeVerification.publication.cid})
}
else if (challengeVerification.challengeSuccess === false) {
onError('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
onError("Error: You seem to have mistyped the CAPTCHA. Please try again.");
setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
}
};
@@ -93,7 +98,7 @@ const Catalog = () => {
challengeAnswers = await getChallengeAnswersFromUser(challenges)
}
catch (error) {
onError(error);
setErrorMessage(error);
}
if (challengeAnswers) {
await comment.publishChallengeAnswers(challengeAnswers)
@@ -109,7 +114,6 @@ const Catalog = () => {
subplebbitAddress: selectedAddress,
onChallenge,
onChallengeVerification,
onError
};
@@ -150,7 +154,7 @@ const Catalog = () => {
};
challengeImg.onerror = () => {
reject(onError('Could not load challenge image'));
reject(setErrorMessage('Could not load challenge image'));
};
});
};
src/components/views/Thread.jsx
+12 -9
View File
@@ -15,10 +15,10 @@ import SettingsModal from '../SettingsModal';
import getCommentMediaInfo from '../../utils/getCommentMediaInfo';
import getDate from '../../utils/getDate';
import handleStyleChange from '../../utils/handleStyleChange';
import onError from '../../utils/onError';
import onSuccess from '../../utils/onSuccess';
import renderThreadComments from '../../utils/renderThreadComments';
import useClickForm from '../../hooks/useClickForm';
import useError from '../../hooks/useError';
import useSuccess from '../../hooks/useSuccess';
const Thread = () => {
@@ -38,7 +38,6 @@ const Thread = () => {
const commentRef = useRef();
const linkRef = useRef();
const [commentContent, setCommentContent] = useState('');
const [isCaptchaOpen, setIsCaptchaOpen] = useState(false);
const [isReplyOpen, setIsReplyOpen] = useState(false);
const [captchaImage, setCaptchaImage] = useState('');
@@ -52,6 +51,11 @@ const Thread = () => {
const commentMediaInfo = getCommentMediaInfo(comment);
const fallbackImgUrl = "/assets/filedeleted-res.gif";
const [errorMessage, setErrorMessage] = useState(null);
const [successMessage, setSuccessMessage] = useState(null);
useError(errorMessage, [errorMessage]);
useSuccess(successMessage, [successMessage]);
// useEffect(() => {
// console.log(comment);
@@ -83,11 +87,11 @@ const Thread = () => {
const onChallengeVerification = (challengeVerification) => {
if (challengeVerification.challengeSuccess === true) {
onSuccess('challenge success', {publishedCid: challengeVerification.publication.cid})
setSuccessMessage('challenge success', {publishedCid: challengeVerification.publication.cid})
}
else if (challengeVerification.challengeSuccess === false) {
onError('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
onError("Error: You seem to have mistyped the CAPTCHA. Please try again.");
setErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
setErrorMessage("Error: You seem to have mistyped the CAPTCHA. Please try again.");
}
};
@@ -99,7 +103,7 @@ const Thread = () => {
challengeAnswers = await getChallengeAnswersFromUser(challenges)
}
catch (error) {
onError(error);
setErrorMessage(error);
}
if (challengeAnswers) {
await comment.publishChallengeAnswers(challengeAnswers)
@@ -115,7 +119,6 @@ const Thread = () => {
subplebbitAddress: selectedAddress,
onChallenge,
onChallengeVerification,
onError
};
@@ -155,7 +158,7 @@ const Thread = () => {
};
challengeImg.onerror = () => {
reject(onError('Could not load challenge image'));
reject(setErrorMessage('Could not load challenge image'));
};
});
};