diff --git a/embark-ui/src/components/Blocks.js b/embark-ui/src/components/Blocks.js index 1f311de8..75773025 100644 --- a/embark-ui/src/components/Blocks.js +++ b/embark-ui/src/components/Blocks.js @@ -2,7 +2,7 @@ import React from 'react'; import {Link} from "react-router-dom"; import {Row, Col, Card, CardHeader, CardBody} from 'reactstrap'; import PropTypes from 'prop-types'; -import Pages from './Pagination'; +import Pagination from './Pagination'; import CardTitleIdenticon from './CardTitleIdenticon'; @@ -37,7 +37,7 @@ const Blocks = ({blocks, changePage, currentPage, numberOfPages}) => ( ))} - + diff --git a/embark-ui/src/components/LoadMore.js b/embark-ui/src/components/LoadMore.js deleted file mode 100644 index 3475686e..00000000 --- a/embark-ui/src/components/LoadMore.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react'; -import {Row, Col, Button} from 'reactstrap'; -import PropTypes from 'prop-types'; - -const LoadMore = ({loadMore}) => ( - - - - - -); - -LoadMore.propTypes = { - loadMore: PropTypes.func -}; - -export default LoadMore; diff --git a/embark-ui/src/components/Pagination.js b/embark-ui/src/components/Pagination.js index d8b1f1dc..a7244b0e 100644 --- a/embark-ui/src/components/Pagination.js +++ b/embark-ui/src/components/Pagination.js @@ -1,10 +1,10 @@ import React from 'react'; -import {Pagination, PaginationItem, PaginationLink} from 'reactstrap'; +import {Pagination as RPagination, PaginationItem, PaginationLink} from 'reactstrap'; import PropTypes from 'prop-types'; const NB_PAGES_MAX = 8; -const Pages = ({currentPage, numberOfPages, changePage}) => { +const Pagination = ({currentPage, numberOfPages, changePage}) => { let max = currentPage + NB_PAGES_MAX / 2; if (max > numberOfPages) { max = numberOfPages; @@ -22,7 +22,7 @@ const Pages = ({currentPage, numberOfPages, changePage}) => { } return ( - + { e.preventDefault(); @@ -43,14 +43,14 @@ const Pages = ({currentPage, numberOfPages, changePage}) => { changePage(currentPage + 1); }}/> - + ); }; -Pages.propTypes = { +Pagination.propTypes = { numberOfPages: PropTypes.number, currentPage: PropTypes.number, changePage: PropTypes.func }; -export default Pages; +export default Pagination; diff --git a/embark-ui/src/components/Transactions.js b/embark-ui/src/components/Transactions.js index 6c062f18..5396fdb8 100644 --- a/embark-ui/src/components/Transactions.js +++ b/embark-ui/src/components/Transactions.js @@ -4,7 +4,7 @@ import {Row, Col, Card, CardHeader, CardBody} from 'reactstrap'; import PropTypes from 'prop-types'; import CardTitleIdenticon from './CardTitleIdenticon'; -import Pages from "./Pagination"; +import Pagination from "./Pagination"; const Transactions = ({transactions, changePage, currentPage, numberOfPages}) => ( @@ -41,7 +41,7 @@ const Transactions = ({transactions, changePage, currentPage, numberOfPages}) => ))} - +