From 171bc69efd0fc72727081526081cb64951d19ea7 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Mon, 19 Aug 2024 17:34:10 -0400 Subject: [PATCH 1/7] Added table pagination --- Client/src/Components/BasicTable/index.jsx | 116 ++++++++++++------ Client/src/assets/icons/left-arrow-double.svg | 3 + .../src/assets/icons/right-arrow-double.svg | 3 + 3 files changed, 83 insertions(+), 39 deletions(-) create mode 100644 Client/src/assets/icons/left-arrow-double.svg create mode 100644 Client/src/assets/icons/right-arrow-double.svg diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index 76f1c61c7..26caf2afc 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -1,3 +1,5 @@ +import PropTypes from "prop-types"; +import { useState, useEffect } from "react"; import { TableContainer, Paper, @@ -6,14 +8,66 @@ import { TableRow, TableCell, TableBody, - Pagination, - PaginationItem, + TablePagination, + Box, + IconButton, } from "@mui/material"; -import React, { useState, useEffect } from "react"; -import PropTypes from "prop-types"; +import LeftArrowDouble from "../../assets/icons/left-arrow-double.svg?react"; +import RightArrowDouble from "../../assets/icons/right-arrow-double.svg?react"; +import LeftArrow from "../../assets/icons/left-arrow.svg?react"; +import RightArrow from "../../assets/icons/right-arrow.svg?react"; import "./index.css"; -import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded"; -import ArrowForwardRoundedIcon from "@mui/icons-material/ArrowForwardRounded"; + +const TablePaginationActions = (props) => { + const { count, page, rowsPerPage, onPageChange } = props; + console.log(count); + + const handleFirstPageButtonClick = (event) => { + onPageChange(event, 0); + }; + const handleBackButtonClick = (event) => { + onPageChange(event, page - 1); + }; + const handleNextButtonClick = (event) => { + onPageChange(event, page + 1); + }; + const handleLastPageButtonClick = (event) => { + onPageChange(event, Math.max(0, Math.ceil(count / rowsPerPage) - 1)); + }; + + return ( + + + + + + + + = Math.ceil(count / rowsPerPage) - 1} + aria-label="next page" + > + + + = Math.ceil(count / rowsPerPage) - 1} + aria-label="last page" + > + + + + ); +}; /** * BasicTable Component @@ -68,10 +122,11 @@ import ArrowForwardRoundedIcon from "@mui/icons-material/ArrowForwardRounded"; * */ -const BasicTable = ({ data, paginated, reversed, rowsPerPage = 5 }) => { +const BasicTable = ({ data, paginated, type, reversed, rows = 5 }) => { // Add headers to props validation const [page, setPage] = useState(0); + const [rowsPerPage, setRowsPerPage] = useState(rows); useEffect(() => { setPage(0); @@ -81,6 +136,11 @@ const BasicTable = ({ data, paginated, reversed, rowsPerPage = 5 }) => { setPage(newPage); }; + const handleChangeRowsPerPage = (event) => { + setRowsPerPage(parseInt(event.target.value, 10)); + setPage(0); + }; + let displayData = []; if (data && data.rows) { @@ -94,36 +154,6 @@ const BasicTable = ({ data, paginated, reversed, rowsPerPage = 5 }) => { return
No data
; } - let paginationComponent = <>; - if (paginated === true && data.rows.length > rowsPerPage) { - paginationComponent = ( - handleChangePage(event, value - 1)} - shape="rounded" - renderItem={(item) => ( - - )} - /> - ); - } - return ( <> @@ -154,8 +184,16 @@ const BasicTable = ({ data, paginated, reversed, rowsPerPage = 5 }) => { - - {paginationComponent} + ); }; diff --git a/Client/src/assets/icons/left-arrow-double.svg b/Client/src/assets/icons/left-arrow-double.svg new file mode 100644 index 000000000..6001a3ead --- /dev/null +++ b/Client/src/assets/icons/left-arrow-double.svg @@ -0,0 +1,3 @@ + + + diff --git a/Client/src/assets/icons/right-arrow-double.svg b/Client/src/assets/icons/right-arrow-double.svg new file mode 100644 index 000000000..4235134d7 --- /dev/null +++ b/Client/src/assets/icons/right-arrow-double.svg @@ -0,0 +1,3 @@ + + + From 6042d87a7d6dc32a4d2ca836780b7735a4da9c73 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Mon, 19 Aug 2024 17:58:48 -0400 Subject: [PATCH 2/7] Styled buttons --- Client/src/Components/BasicTable/index.css | 25 +++++++++++++++ Client/src/Components/BasicTable/index.jsx | 37 ++++++++++++---------- 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css index 629c8dd7b..19831a425 100644 --- a/Client/src/Components/BasicTable/index.css +++ b/Client/src/Components/BasicTable/index.css @@ -125,3 +125,28 @@ .MuiPaper-root + .MuiPagination-root div.MuiPaginationItem-root { user-select: none; } + +.MuiTablePagination-root p { + color: var(--env-var-color-5); +} +.MuiTablePagination-root button { + min-width: 0; + padding: 4px; + margin-left: 5px; + border-color: #ebebeb; +} +.MuiTablePagination-root svg { + width: 22px; + height: 22px; +} +.MuiTablePagination-root svg path { + stroke: var(--env-var-color-5); + stroke-width: 1.3; +} +.MuiTablePagination-root button.Mui-disabled { + opacity: 0.4; +} +.MuiTablePagination-root button:not(.Mui-disabled):hover { + background-color: #f4f4f4; + border-color: #f4f4f4; +} diff --git a/Client/src/Components/BasicTable/index.jsx b/Client/src/Components/BasicTable/index.jsx index 26caf2afc..8c9031a9e 100644 --- a/Client/src/Components/BasicTable/index.jsx +++ b/Client/src/Components/BasicTable/index.jsx @@ -17,10 +17,10 @@ import RightArrowDouble from "../../assets/icons/right-arrow-double.svg?react"; import LeftArrow from "../../assets/icons/left-arrow.svg?react"; import RightArrow from "../../assets/icons/right-arrow.svg?react"; import "./index.css"; +import Button from "../Button"; const TablePaginationActions = (props) => { const { count, page, rowsPerPage, onPageChange } = props; - console.log(count); const handleFirstPageButtonClick = (event) => { onPageChange(event, 0); @@ -37,34 +37,34 @@ const TablePaginationActions = (props) => { return ( - } onClick={handleFirstPageButtonClick} disabled={page === 0} aria-label="first page" - > - - - +