Skip to content

Commit 2b84914

Browse files
authored
Merge pull request #87 from CS3219-AY2324S1/86-page-issue
fix pagination
2 parents 6c48897 + f873589 commit 2b84914

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

frontend/src/components/AdminUsersTable.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const ITEMS_PER_PAGE_OPTIONS = [5, 10]; // Number of items to display per page
1616

1717
const AdminUsersTable: React.FC = () => {
1818
const [adminUsersData, setAdminUsers] = useState<AdminUser[]>([]);
19-
const [currentPage, setCurrentPage] = useState<number>(1);
19+
const [currentPage, setCurrentPage] = useState<number>(0);
2020
const [itemsPerPage, setItemsPerPage] = useState<number>(ITEMS_PER_PAGE_OPTIONS[0]);
2121
const { adminUsers, getAdminUsers } = useData();
2222

@@ -40,7 +40,7 @@ const AdminUsersTable: React.FC = () => {
4040
event: SelectChangeEvent<unknown>,
4141
) => {
4242
setItemsPerPage(event.target.value as number);
43-
setCurrentPage(1);
43+
setCurrentPage(0);
4444
};
4545

4646
const removeAdmin = async (admin: AdminUser, index: number) => {
@@ -55,7 +55,7 @@ const AdminUsersTable: React.FC = () => {
5555
setAdminUsers(adminUsersData.filter((e, i) => i !== index));
5656
}
5757

58-
const indexOfLastAdmin = currentPage * itemsPerPage;
58+
const indexOfLastAdmin = (currentPage + 1) * itemsPerPage;
5959
const indexOfFirstAdmin = indexOfLastAdmin - itemsPerPage;
6060
const currentAdmins = adminUsersData.slice(indexOfFirstAdmin, indexOfLastAdmin);
6161

@@ -118,7 +118,7 @@ const AdminUsersTable: React.FC = () => {
118118
component="div"
119119
count={adminUsersData.length}
120120
rowsPerPage={itemsPerPage}
121-
page={currentPage - 1}
121+
page={currentPage}
122122
onPageChange={handlePageChange} />
123123
</div></>
124124

frontend/src/components/Questions/EditQuestionsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const EditQuestionsTable: React.FC<EditQuestionsTableProps> = ({onEdit, onDelete
5454
event: SelectChangeEvent<unknown>,
5555
) => {
5656
setItemsPerPage(event.target.value as number);
57-
setCurrentPage(1);
57+
setCurrentPage(0);
5858
};
5959

6060
const handleExpandClick = (id: string) => {

frontend/src/components/Questions/QuestionsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const filteredQuestions = questionsData.filter(question =>
7070

7171
const handleChangeItemsPerPage = (event: SelectChangeEvent<unknown>) => {
7272
setItemsPerPage(event.target.value as number);
73-
setCurrentPage(1);
73+
setCurrentPage(0);
7474
};
7575

7676
const indexOfLastQuestion = (currentPage + 1) * itemsPerPage;

0 commit comments

Comments
 (0)