From 42ace9e9c0a845b248f86ccada786109feae914b Mon Sep 17 00:00:00 2001 From: john <johnbarlas39@gmail.com> Date: Sat, 15 Apr 2017 16:30:29 +0300 Subject: [PATCH] minor cleanup --- app/components/Dashboard/Book.jsx | 2 ++ app/components/Dashboard/Dashboard.jsx | 1 - app/components/common/AbstractModal.jsx | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/components/Dashboard/Book.jsx b/app/components/Dashboard/Book.jsx index 2e0b91e..2a56a60 100644 --- a/app/components/Dashboard/Book.jsx +++ b/app/components/Dashboard/Book.jsx @@ -4,6 +4,7 @@ import { Link } from 'react-router' import RemoveBookModal from './RemoveBookModal' import styles from './dashboard.local.scss' +// TODO -- Book and Chapter should both extend a common component class Book extends React.Component { constructor (props) { super(props) @@ -35,6 +36,7 @@ class Book extends React.Component { ) } + // TODO -- edit, rename and remove should be reusable components renderEdit () { const { book } = this.props diff --git a/app/components/Dashboard/Dashboard.jsx b/app/components/Dashboard/Dashboard.jsx index 0d1a1c4..42708c7 100644 --- a/app/components/Dashboard/Dashboard.jsx +++ b/app/components/Dashboard/Dashboard.jsx @@ -2,7 +2,6 @@ import Actions from 'pubsweet-client/src/actions' import React from 'react' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' -// import { Link } from 'react-router' import AddBook from './AddBook' import BookList from './BookList' diff --git a/app/components/common/AbstractModal.jsx b/app/components/common/AbstractModal.jsx index 2bf9cc2..ad15dd0 100644 --- a/app/components/common/AbstractModal.jsx +++ b/app/components/common/AbstractModal.jsx @@ -39,10 +39,15 @@ export class BookBuilderModal extends React.Component { renderFooter () { const { successAction, successText, toggle } = this.props - const success = successAction ? <a className='modal-button bb-modal-act' - onClick={this.performAction}> - { successText } - </a> : null + const successButton = ( + <a + className='modal-button bb-modal-act' + onClick={this.performAction}> + { successText } + </a> + ) + + const success = successAction ? successButton : null return ( <Modal.Footer> @@ -53,7 +58,7 @@ export class BookBuilderModal extends React.Component { Cancel </a> - {success} + { success } </div> </Modal.Footer> -- GitLab