Skip to content

Commit

Permalink
navigation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
VijeshVS committed Jun 1, 2024
1 parent 5b22bc1 commit 85911f7
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 56 deletions.
5 changes: 3 additions & 2 deletions app/app/(dashboard)/links/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export default function Page() {
</div>
)}

<Pagination className="mt-14">
{totalPages > 1? <Pagination className="mt-14">
<PaginationContent>
<PaginationItem>
<PaginationPrevious
Expand Down Expand Up @@ -187,7 +187,8 @@ export default function Page() {
/>
</PaginationItem>
</PaginationContent>
</Pagination>
</Pagination>:<div></div>}

</div>
);
}
101 changes: 49 additions & 52 deletions app/app/(dashboard)/qrcodes/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,58 +103,55 @@ export default function QRCodePage() {
<QRCodeCardComponent key={qr.id} qrcode={qr} />
))}

<Pagination className="mt-14">
<PaginationContent>
<PaginationItem>
<PaginationPrevious
onClick={() => pagination(0, paginateOperation.PREV)}
href="#"
/>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() =>
pagination(pageOrder.ONE, paginateOperation.CLICK)
}
isActive={paginator.pageActive == pageOrder.ONE}
href="#"
>
{paginator.value}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() =>
pagination(pageOrder.TWO, paginateOperation.CLICK)
}
isActive={paginator.pageActive == pageOrder.TWO}
href="#"
>
{paginator.value + 1}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() =>
pagination(pageOrder.THREE, paginateOperation.CLICK)
}
isActive={paginator.pageActive == pageOrder.THREE}
href="#"
>
{paginator.value + 2}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationEllipsis />
</PaginationItem>
<PaginationItem>
<PaginationNext
onClick={() => pagination(0, paginateOperation.NEXT)}
href="#"
/>
</PaginationItem>
</PaginationContent>
</Pagination>
{totalPages > 1? <Pagination className="mt-14">
<PaginationContent>
<PaginationItem>
<PaginationPrevious
onClick={() => pagination(0, paginateOperation.PREV)}
href="#"
/>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() => pagination(pageOrder.ONE, paginateOperation.CLICK)}
isActive={paginator.pageActive == pageOrder.ONE}
href="#"
>
{paginator.value}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() => pagination(pageOrder.TWO, paginateOperation.CLICK)}
isActive={paginator.pageActive == pageOrder.TWO}
href="#"
>
{paginator.value + 1}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink
onClick={() =>
pagination(pageOrder.THREE, paginateOperation.CLICK)
}
isActive={paginator.pageActive == pageOrder.THREE}
href="#"
>
{paginator.value + 2}
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationEllipsis />
</PaginationItem>
<PaginationItem>
<PaginationNext
onClick={() => pagination(0, paginateOperation.NEXT)}
href="#"
/>
</PaginationItem>
</PaginationContent>
</Pagination>:<div></div>}

</div>
)}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/app/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ const LoginPage = () => {
>
Login
</Button>
<div className="flex justify-center">
{/* <div className="flex justify-center">
<Button className="mt-4" onClick={handleGoogleLogin}>
<KeyRound size={18}/>
<h1 className="ml-2">Sign in with google</h1>
</Button>
</div>
</div> */}

</div>

Expand Down

0 comments on commit 85911f7

Please sign in to comment.