diff --git a/client/src/app/components/hoc/AdminRoutes.jsx b/client/src/app/components/hoc/AdminRoutes.jsx index 2b579d1..528214d 100644 --- a/client/src/app/components/hoc/AdminRoutes.jsx +++ b/client/src/app/components/hoc/AdminRoutes.jsx @@ -7,16 +7,19 @@ const AdminRoutes = ({ isAuthenticated, tokenExists, isAdmin, - component: Component, + component, ...rest -}) => ( - (isAuthenticated && isAdmin && tokenExists ? - : - )} - /> -); +}) => { + const PassedComponent = component; + return ( + (isAuthenticated && isAdmin && tokenExists ? + : + )} + /> + ); +}; AdminRoutes.defaultProps = { isAdmin: false diff --git a/client/src/app/components/hoc/UserRoutes.jsx b/client/src/app/components/hoc/UserRoutes.jsx index 4a662b9..5a40148 100644 --- a/client/src/app/components/hoc/UserRoutes.jsx +++ b/client/src/app/components/hoc/UserRoutes.jsx @@ -9,7 +9,6 @@ const UserRoutes = ({ component, ...rest }) => { - // console.log({ isAuthenticated, tokenExists }); const PassedComponent = component; return ( ({ diff --git a/client/src/app/components/presentation/common/book/DisplayBook.jsx b/client/src/app/components/presentation/common/book/DisplayBook.jsx index fc53c6c..a86ddc7 100644 --- a/client/src/app/components/presentation/common/book/DisplayBook.jsx +++ b/client/src/app/components/presentation/common/book/DisplayBook.jsx @@ -71,9 +71,7 @@ class Book extends React.Component { showCancelButton: true, confirmButtonText: 'Yes, delete it!', cancelButtonText: 'No, cancel!', - confirmButtonClass: 'btn btn-success', - cancelButtonClass: 'btn btn-danger', - buttonsStyling: false, + buttonsStyling: true, reverseButtons: true }).then(() => { this diff --git a/client/src/app/components/presentation/common/modal/BookDetailForm.jsx b/client/src/app/components/presentation/common/modal/BookDetailForm.jsx index 38e034f..5d2c65e 100644 --- a/client/src/app/components/presentation/common/modal/BookDetailForm.jsx +++ b/client/src/app/components/presentation/common/modal/BookDetailForm.jsx @@ -66,7 +66,7 @@ class BookDetailForm extends React.PureComponent { { User Return Date Book Status Overdue - Due In + Due