From 991db14841c0ef17221f2010cdc4d2aa3ec5513c Mon Sep 17 00:00:00 2001 From: Alf Eaton <eaton.alf@gmail.com> Date: Fri, 7 Jul 2017 13:26:54 +0100 Subject: [PATCH] Refactor actions components --- app/components/ProjectActions.css | 14 ------------ app/components/ProjectActions.js | 32 ++++++--------------------- app/components/VersionActions.js | 36 +++++++++++++++++++------------ 3 files changed, 29 insertions(+), 53 deletions(-) delete mode 100644 app/components/ProjectActions.css diff --git a/app/components/ProjectActions.css b/app/components/ProjectActions.css deleted file mode 100644 index 61f7699676..0000000000 --- a/app/components/ProjectActions.css +++ /dev/null @@ -1,14 +0,0 @@ -.project-actions { - margin: 20px auto; - width: auto; - text-align: center; - font-size: 120%; - white-space: nowrap; - padding-bottom: 20px; -} - -.project-action { - color: #4990E2; - text-decoration-color: #aaa; - text-decoration-skip: ink -} diff --git a/app/components/ProjectActions.js b/app/components/ProjectActions.js index 18ac87ad59..566f19438a 100644 --- a/app/components/ProjectActions.js +++ b/app/components/ProjectActions.js @@ -2,35 +2,17 @@ import React from 'react' import PropTypes from 'prop-types' import { Link } from 'react-router' -import './ProjectActions.css' -import { Button } from 'react-bootstrap' +import './Actions.css' const ProjectActions = ({ project, approveSubmission }) => ( - <div className="project-actions content-metadata"> - {project.status === 'submitted' ? ( - <div> - <div> - <Button onClick={approveSubmission}>Approve submission</Button> - </div> - - <div> - <Link to={`/projects/${project.id}/editor`} className="project-action">assign an editor</Link> - </div> - - <div> - <Link to={`/projects/${project.id}/reviewers`} className="project-action">invite reviewers</Link> - </div> + <div className="actions content-metadata"> + <div className="action"> + <Link to={`/projects/${project.id}/editor`} className="project-action">assign an editor</Link> </div> - ) : ( - <div> - <div> - <Link to={`/editor/${project.id}`} target="editor" className="project-action">edit your manuscript</Link> - </div> - <div> - <Link to={`/projects/${project.id}/declarations`} className="project-action">submit for publication</Link> - </div> + + <div className="action"> + <Link to={`/projects/${project.id}/reviewers`} className="project-action">invite reviewers</Link> </div> - )} </div> ) diff --git a/app/components/VersionActions.js b/app/components/VersionActions.js index d202627b56..7e46c359be 100644 --- a/app/components/VersionActions.js +++ b/app/components/VersionActions.js @@ -2,28 +2,36 @@ import React from 'react' import PropTypes from 'prop-types' import { Link } from 'react-router' -import './VersionActions.css' +import './Actions.css' const VersionActions = ({ project, version }) => ( - <div className="version-actions"> - <div> - <Link to={`/editor/${project.id}/${version.id}`} target="editor" - className="version-action">{version.submitted ? 'view your manuscript' : 'edit your manuscript'}</Link> + <div className="actions"> + <div className="action"> + <Link to={`/editor/${project.id}/${version.id}`} target="editor">{version.snapshot ? 'view your manuscript' : 'edit your manuscript'}</Link> </div> - <div> - <Link to={`/projects/${project.id}/declarations`} - className="version-action">{version.submitted ? 'view declarations' : 'submit for peer review'}</Link> + <div className="action"> + <Link to={`/projects/${project.id}/declarations`}>{version.snapshot ? 'view declarations' : 'edit declarations'}</Link> </div> - <div style={{marginTop: 20}}> - <Link to={`/projects/${project.id}/review`} - className="version-action">submit your review</Link> + <div className="action"> + <Link to={`/projects/${project.id}/check`}>check submission</Link> </div> - <div> - <Link to={`/projects/${project.id}/decision`} - className="version-action">submit your decision</Link> + <div className="action"> + <Link to={`/projects/${project.id}/submit`}>submit for peer review</Link> + </div> + + <div className="action"> + <Link to={`/projects/${project.id}/submit`}>publish preprint</Link> + </div> + + <div className="action"> + <Link to={`/projects/${project.id}/review`}>submit your review</Link> + </div> + + <div className="action"> + <Link to={`/projects/${project.id}/decision`}>submit your decision</Link> </div> </div> ) -- GitLab