diff --git a/src/App.css b/src/App.css index e65c32d..3ed2c15 100644 --- a/src/App.css +++ b/src/App.css @@ -202,3 +202,4 @@ body { max-width: 300px; } } + \ No newline at end of file diff --git a/src/components/characterDetail/CharacterDetails.jsx b/src/components/characterDetail/CharacterDetails.jsx index 4c814bf..b3b2c62 100644 --- a/src/components/characterDetail/CharacterDetails.jsx +++ b/src/components/characterDetail/CharacterDetails.jsx @@ -19,8 +19,11 @@ const CharacterDetails = () => { }) .catch((err) => { console.log(err); + }) + .finally(() => { + setLoading(false); }); - }, []); + }, [id]); if (loading) { return
loading...
; @@ -50,7 +53,7 @@ const CharacterDetails = () => { Skin Color {character.skin_color}- Eye Color {character.eye_color} + Eye Color {character.eye_color}
Birth Year {character.birth_year}
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 7f8efe9..5cdb1a2 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -29,7 +29,7 @@ const Home = () => {
.then((res) => {
const results = res.data.results;
if (results.length > 0) {
- setData((prevData) => [...prevData, ...results]);
+ setData((prevData) => [...prevData, ...results]);
setFilteredData((prevData) => [...prevData, ...results]);
} else {
setHasMore(false);
@@ -42,7 +42,7 @@ const Home = () => {
setHasMore(false);
});
}, 1000);
- }, [page]);
+ }, [page]);
useEffect(() => {
if (inView && hasMore && !loading) {
@@ -122,8 +122,7 @@ const Home = () => {
-