Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,7 @@ function App() {
setInputSearch={setInputSearch}
/>

<Navigation
pageNumber={pageNumber}
maxPageNumber={maxPageNumber}
setPageNumber={setPageNumber}
setSortByForks={setSortByForks}
setSortByStars={setSortByStars}
reducedState={reducedState}
setReducedState={setReducedState}
hidePagination={hidePagination}
removePagination={true}
hasFilters
/>


<CardSet
pageNumber={pageNumber}
Expand Down
14 changes: 8 additions & 6 deletions src/components/Navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ const Navigation = ({
}) => {
const { theme, changeTheme } = useContext(ThemeContext);
let paginationItems = [];
const [selectedPage, setSelectedPage] = useState();
if (pageNumber <= 3) pushItems(1, 5); // First 3 pages

if (maxPageNumber <= 5) {
pushItems(1, maxPageNumber);// First 3 pages
}else if (pageNumber <=3) pushItems(1, 5); // First 5 pages
else if (maxPageNumber - 2 <= pageNumber)
pushItems(maxPageNumber - 4, maxPageNumber); // Last 3 pages
else pushItems(pageNumber - 2, pageNumber + 2); // Other Pages
Expand All @@ -34,15 +36,15 @@ const Navigation = ({
paginationItems.push(
<div
className={`hover:scale-105 transition-all ease-linear duration-200 cursor-pointer rounded-full w-5 h-5 flex justify-center items-center p-1 ${
selectedPage === idx
pageNumber === idx
? "text-black bg-[#d9d9d9] font-bold scale-125"
: "text-black bg-white "
} `}
key={idx}
active={idx === pageNumber}
onClick={() => {
setPageNumber(idx);
setSelectedPage(idx);

}}
>
{idx}
Expand All @@ -60,7 +62,7 @@ const Navigation = ({
<div className="flex justify-center items-center gap-2 mb-20">
<div
onClick={() => {
setPageNumber(1);
if (pageNumber > 1) setPageNumber(pageNumber - 1);
}}
className={`cursor-pointer hover:scale-105 transition-all ease-linear duration-200 w-9 h-9 ${
theme.mode === "light" ? "bg-black" : "bg-white"
Expand All @@ -77,7 +79,7 @@ const Navigation = ({

<div
onClick={() => {
setPageNumber(maxPageNumber);
if(pageNumber < maxPageNumber) setPageNumber(pageNumber + 1);
}}
className={`cursor-pointer hover:scale-105 transition-all ease-linear duration-200 w-9 h-9 ${
theme.mode === "light" ? "bg-black" : "bg-white"
Expand Down