diff --git a/.vs/LEARNIHON/FileContentIndex/8b62d542-6a90-4e8e-911c-376b5df63c5a.vsidx b/.vs/LEARNIHON/FileContentIndex/8b62d542-6a90-4e8e-911c-376b5df63c5a.vsidx new file mode 100644 index 0000000..3c60d02 Binary files /dev/null and b/.vs/LEARNIHON/FileContentIndex/8b62d542-6a90-4e8e-911c-376b5df63c5a.vsidx differ diff --git a/.vs/LEARNIHON/FileContentIndex/985f779d-3e71-41e7-8e72-34b885e698a7.vsidx b/.vs/LEARNIHON/FileContentIndex/985f779d-3e71-41e7-8e72-34b885e698a7.vsidx deleted file mode 100644 index 1fcabfc..0000000 Binary files a/.vs/LEARNIHON/FileContentIndex/985f779d-3e71-41e7-8e72-34b885e698a7.vsidx and /dev/null differ diff --git a/.vs/LEARNIHON/FileContentIndex/c4f4ae09-c384-4dd2-87f4-19f2615f5a9c.vsidx b/.vs/LEARNIHON/FileContentIndex/c4f4ae09-c384-4dd2-87f4-19f2615f5a9c.vsidx deleted file mode 100644 index 7060fc4..0000000 Binary files a/.vs/LEARNIHON/FileContentIndex/c4f4ae09-c384-4dd2-87f4-19f2615f5a9c.vsidx and /dev/null differ diff --git a/.vs/LEARNIHON/FileContentIndex/d3547d75-a692-4b0c-a286-04b099bcd097.vsidx b/.vs/LEARNIHON/FileContentIndex/d3547d75-a692-4b0c-a286-04b099bcd097.vsidx new file mode 100644 index 0000000..f0d1dce Binary files /dev/null and b/.vs/LEARNIHON/FileContentIndex/d3547d75-a692-4b0c-a286-04b099bcd097.vsidx differ diff --git a/components/KanjiCard.tsx b/components/KanjiCard.tsx index 5154b8f..73d21e3 100644 --- a/components/KanjiCard.tsx +++ b/components/KanjiCard.tsx @@ -25,7 +25,6 @@ const KanjiCard = (props: KanjiProps) => { } } - const [loading, setLoading] = useState(true); const [kanji, setKanji] = useState((): Kanji | null => { return null }); const [imgXml, setImgXml] = useState(''); @@ -35,14 +34,7 @@ const KanjiCard = (props: KanjiProps) => { const allKanjis: Kanji[] = [].concat(...Object.values(kanjis)) const selectedKanji = allKanjis[Math.floor(Math.random() * allKanjis.length)] - const fetchData = async () => { - await fetch(`https://kanjialive-api.p.rapidapi.com/api/public/kanji/${props.kanji}`, options) - .then(async response => { - const data = await response.json() - setKanji(KanjiMapper.ApiJsonToKanji(data)); - }) - .catch(err => console.log(err)); - } + const fetchXml = async () => { if (kanji) { @@ -52,38 +44,30 @@ const KanjiCard = (props: KanjiProps) => { } useEffect(() => { - setLoading(true); - fetchData().then(_ => { - setKanji(selectedKanji); - setLoading(false); - }); + setKanji(selectedKanji); }, []); useEffect(() => { - setLoading(true); fetchXml().then(_ => { - setLoading(false); }); }, [kanji]); return ( - {loading ? Loading... : {kanji?.onyomi}} - {!loading && ( + {kanji?.onyomi} - )} - {loading ? : {kanji?.meaning}} + {kanji?.meaning}