bhavnish.arora/assignment-4
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

dev #1

Merged
rishabh merged 7 commits from dev into main 2025-01-02 12:46:37 +00:00
Conversation 0 Commits 7 Files changed 20 +9 -6
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 014ca376a8 - Show all commits

1
src/App.css
View file

@ -202,3 +202,4 @@ body {
max-width: 300px; max-width: 300px;
} }
} }

7
src/components/characterDetail/CharacterDetails.jsx
View file

@ -19,8 +19,11 @@ const CharacterDetails = () => {
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
})
rishabh commented 2025-01-02 07:48:20 +00:00
Outdated
Review
Copy link

Add .finally statement for stop the loading

Add .finally statement for stop the loading
.finally(() => {
rishabh commented 2025-01-02 07:47:08 +00:00
Outdated
Review
Copy link

id need to be in dependancy array

id need to be in dependancy array
setLoading(false);
}); });
}, []); }, [id]);
if (loading) { if (loading) {
return <p> loading...</p>; return <p> loading...</p>;
@ -50,7 +53,7 @@ const CharacterDetails = () => {
<strong>Skin Color </strong> {character.skin_color} <strong>Skin Color </strong> {character.skin_color}
</p> </p>
<p> <p>
<strong>Eye Color </strong> {character.eye_color} <strong>Eye Color </strong> {character.eye_color}
</p> </p>
<p> <p>
<strong>Birth Year </strong> {character.birth_year} <strong>Birth Year </strong> {character.birth_year}

7
src/pages/Home.jsx
View file

@ -29,7 +29,7 @@ const Home = () => {
.then((res) => { .then((res) => {
const results = res.data.results; const results = res.data.results;
if (results.length > 0) { if (results.length > 0) {
setData((prevData) => [...prevData, ...results]); setData((prevData) => [...prevData, ...results]);
setFilteredData((prevData) => [...prevData, ...results]); setFilteredData((prevData) => [...prevData, ...results]);
} else { } else {
setHasMore(false); setHasMore(false);
@ -42,7 +42,7 @@ const Home = () => {
setHasMore(false); setHasMore(false);
}); });
}, 1000); }, 1000);
}, [page]); }, [page]);
useEffect(() => { useEffect(() => {
if (inView && hasMore && !loading) { if (inView && hasMore && !loading) {
@ -122,8 +122,7 @@ const Home = () => {
</div> </div>
</div> </div>
<CharacterCard data={filteredData} /> <CharacterCard data={filteredData} />
{showSkeleton && hasMore && ( {showSkeleton && hasMore && (
<ul className="skeleton-character-container"> <ul className="skeleton-character-container">
{[...Array.from({ length: 5 })].map((_, index) => ( {[...Array.from({ length: 5 })].map((_, index) => (