bug-fix (Heroku build):

-Changes to the loading of the borrowed books
benfluleck · Nov 22, 2017 · 6622ffc · 6622ffc
1 parent d10c50d
commit 6622ffc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/client/src/app/components/container/booklist/DisplayLandingBooks.jsx b/client/src/app/components/container/booklist/DisplayLandingBooks.jsx
@@ -51,12 +51,11 @@ class DisplayLandingBooks extends React.Component {
   render() {
     const fetchingState = this.props.isFetching ?
       <Preloader size="big" className="center-align" /> : null;
-
     const getAllBooks = (this
       .props
-      .books) ? this
+      .recentBooks) ? this
         .props
-        .books
+        .recentBooks
         .map(book => (<Book
           key={book.id}
           id={book.id}
@@ -71,7 +70,9 @@ class DisplayLandingBooks extends React.Component {
     return (
       <div className="recent-books">
         <Row>
+          <div className="landing-page-image">
           {[...getAllBooks]}
+          </div>
         </Row>
       </div>
     );
@@ -87,7 +88,7 @@ DisplayLandingBooks.defaultProps = {
 };
 
 const mapStateToProps = ({ bookReducer }) => ({
-  books: bookReducer.recentBooksList,
+  recentBooks: bookReducer.recentBooksList,
   isFetching: bookReducer.fetchingBooks
 });
 

diff --git a/client/src/app/components/presentation/common/book/DisplayBookModal.jsx b/client/src/app/components/presentation/common/book/DisplayBookModal.jsx
@@ -54,14 +54,7 @@ class DisplayBookModal extends React.Component {
           $(`#modal-${this.props.id}`).modal({opacity: 0})
       })
   }  
-
-
 render(){
-  const isBorrowed = (this.props.borrowedBooksList.books) ? this.props.borrowedBooksList.books.map(book => {
-      return (book.bookid)
-    }) : [];
-  const loanstatus = isBorrowed.includes(this.state.bookId)
-
 if(!this.props.isAuthenticated){
 return(
   <Modal id={`modal-${this.props.id}`} fixedFooter header="Loan Book">
@@ -87,7 +80,12 @@ return(
 }
 
 else{
+  const isBorrowed = (this.props.borrowedBooksList.books) ? this.props.borrowedBooksList.books.map(book => {
+      return (book.bookid)
+    }) : [];
+  const loanstatus = isBorrowed.includes(this.state.bookId)
   return (
+
     <Modal id={`modal-${this.props.id}`} fixedFooter header="Loan Book" 
     actions={<div>{!loanstatus ?
       <Button className="loan-button" onClick={this.handleBorrowClick}> Loan </Button> : 

diff --git a/client/src/app/css/style.scss b/client/src/app/css/style.scss
@@ -65,6 +65,9 @@ p {
 	padding-top: 20px;
 }
 
+.landing-page-image .card{
+	max-width: 85% !important;
+}
 
 form p {
 	color: $secondary-color;
@@ -167,7 +170,7 @@ form p {
 }
 
 .overlay-main {
-	margin-top: -59vh;
+	margin-top: -56vh;
 	padding: 50px;
 	width: calc(100% - 20px);
 	max-width: 1600px;