Skip to content

Commit 4199705

Browse files
committed
Fixed merge issue
1 parent c5df497 commit 4199705

File tree

1 file changed

+1
-53
lines changed
  • frontend/src/main-page/grants/grant-list

1 file changed

+1
-53
lines changed

frontend/src/main-page/grants/grant-list/index.tsx

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -109,59 +109,7 @@ const GrantList: React.FC<GrantListProps> = observer(({ selectedGrantId, onClear
109109
<NewGrantModal onClose={() => setShowNewGrantModal(false)} />
110110
)}
111111
</div>
112-
<Pagination.Root
113-
className="pt-4"
114-
count={count}
115-
pageSize={ITEMS_PER_PAGE}
116-
page={currentPage}
117-
onClick={() => {
118-
if (onClearSelectedGrant) {
119-
onClearSelectedGrant();
120-
}
121-
}}
122-
onPageChange={(e) => {
123-
setPage(e.page);
124-
}}
125-
>
126-
<ButtonGroup variant="ghost" size="md">
127-
<Pagination.PrevTrigger asChild>
128-
<IconButton>
129-
<HiChevronLeft />
130-
</IconButton>
131-
</Pagination.PrevTrigger>
132-
<Pagination.Context>
133-
{({ pages }) =>
134-
pages.map((page, index) =>
135-
page.type === "page" ? (
136-
<IconButton
137-
key={index}
138-
className={
139-
currentPage === page.value
140-
? "text-dark-blue underline"
141-
: "ghost"
142-
}
143-
onClick={() => setPage(page.value)}
144-
aria-label={`Go to page ${page.value}`}
145-
>
146-
{page.value}
147-
</IconButton>
148-
) : (
149-
"..."
150-
)
151-
)
152-
}
153-
</Pagination.Context>
154-
<Pagination.NextTrigger asChild>
155-
<IconButton>
156-
<HiChevronRight />
157-
</IconButton>
158-
</Pagination.NextTrigger>
159-
</ButtonGroup>
160-
</Pagination.Root>
161-
{showNewGrantModal && (
162-
<NewGrantModal onClose={() => setShowNewGrantModal(false)} />
163-
)}
164-
</div>
112+
165113
);
166114
}
167115
);

0 commit comments

Comments
 (0)