Skip to content

Commit 11ce70b

Browse files
authored
Merge pull request #60 from zecrypt-io/feature/shivil/UI-Correction
Feature/shivil/UI correction
2 parents e751ece + a5ff5b6 commit 11ce70b

13 files changed

Lines changed: 1386 additions & 1553 deletions

packages/frontend-web/components/accounts-content.tsx

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -473,53 +473,55 @@ export function AccountsContent() {
473473

474474
{/* Pagination */}
475475
{totalPages > 1 && (
476-
<div className="flex items-center justify-between">
477-
<div className="text-sm text-muted-foreground">
478-
{translate("showing", "accounts")} {(currentPage - 1) * itemsPerPage + 1}-
479-
{Math.min(currentPage * itemsPerPage, totalCount)} {translate("of", "accounts")} {totalCount}
480-
</div>
481-
<Pagination>
482-
<PaginationContent>
483-
<PaginationItem>
484-
<PaginationPrevious
485-
href="#"
486-
onClick={(e) => {
487-
e.preventDefault();
488-
prevPage();
489-
}}
490-
className={currentPage === 1 ? "pointer-events-none opacity-50" : ""}
491-
/>
492-
</PaginationItem>
493-
{getPaginationRange().map((page, i) => (
494-
<PaginationItem key={i}>
495-
{page === "..." ? (
496-
<PaginationEllipsis />
497-
) : (
498-
<PaginationLink
499-
href="#"
500-
onClick={(e) => {
501-
e.preventDefault();
502-
goToPage(page as number);
503-
}}
504-
isActive={currentPage === page}
505-
>
506-
{page}
507-
</PaginationLink>
508-
)}
476+
<div className="flex items-center justify-end">
477+
<div className="flex items-center gap-4 ml-auto">
478+
<div className="text-sm text-muted-foreground whitespace-nowrap">
479+
{translate("showing", "accounts")} {(currentPage - 1) * itemsPerPage + 1}-
480+
{Math.min(currentPage * itemsPerPage, totalCount)} {translate("of", "accounts")} {totalCount}
481+
</div>
482+
<Pagination>
483+
<PaginationContent>
484+
<PaginationItem>
485+
<PaginationPrevious
486+
href="#"
487+
onClick={(e) => {
488+
e.preventDefault();
489+
prevPage();
490+
}}
491+
className={currentPage === 1 ? "pointer-events-none opacity-50" : ""}
492+
/>
509493
</PaginationItem>
510-
))}
511-
<PaginationItem>
512-
<PaginationNext
513-
href="#"
514-
onClick={(e) => {
515-
e.preventDefault();
516-
nextPage();
517-
}}
518-
className={currentPage === totalPages ? "pointer-events-none opacity-50" : ""}
519-
/>
520-
</PaginationItem>
521-
</PaginationContent>
522-
</Pagination>
494+
{getPaginationRange().map((page, i) => (
495+
<PaginationItem key={i}>
496+
{page === "..." ? (
497+
<PaginationEllipsis />
498+
) : (
499+
<PaginationLink
500+
href="#"
501+
onClick={(e) => {
502+
e.preventDefault();
503+
goToPage(page as number);
504+
}}
505+
isActive={currentPage === page}
506+
>
507+
{page}
508+
</PaginationLink>
509+
)}
510+
</PaginationItem>
511+
))}
512+
<PaginationItem>
513+
<PaginationNext
514+
href="#"
515+
onClick={(e) => {
516+
e.preventDefault();
517+
nextPage();
518+
}}
519+
className={currentPage === totalPages ? "pointer-events-none opacity-50" : ""}
520+
/>
521+
</PaginationItem>
522+
</PaginationContent>
523+
</Pagination>
524+
</div>
523525
</div>
524526
)}
525527

0 commit comments

Comments
 (0)