From 6b75370283a6c50a8065abe6d74b6e48107a7008 Mon Sep 17 00:00:00 2001 From: Cloudburst <18114966+C10udburst@users.noreply.github.com> Date: Sun, 2 Oct 2022 21:37:57 +0200 Subject: [PATCH] uhh maybe now the alerta will work --- src/pages/repos.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/pages/repos.js b/src/pages/repos.js index e756216..17117f7 100644 --- a/src/pages/repos.js +++ b/src/pages/repos.js @@ -12,20 +12,14 @@ import { IconContext } from "react-icons"; const IndexPage = () => { const [repos, setRepos] = useState(null); - const [afterTimeout, setAfterTimeout] = useState(false); + const [hadError, setHadError] = useState(false); useEffect(() => { - setTimeout(() => { - setAfterTimeout(true) - }, 5000); - fetch("https://raw.githubusercontent.com/recloudstream/cs-repos/master/repos-db.json") - .catch(err => { - setAfterTimeout(true) - }) + fetch("https://raw.githubusercontent.com/recloudstream/cs-repos/master/repos-db.json", { signal: AbortSignal.timeout(5000) }) + .catch(err => { setHadError(true) }) .then(r => r.json()) - .then(data => { - setRepos(data) - }) + .then(setRepos) + .catch(err => { setHadError(true) }) }, [setRepos]) return @@ -47,7 +41,7 @@ const IndexPage = () => { - {(!repos && !afterTimeout) && + {(!repos && !setHadError) &&
Fetching data... @@ -60,7 +54,7 @@ const IndexPage = () => { {repos.map((it, index) => )} } - {(!repos && afterTimeout) && + {(!repos && setHadError) &&