From 7eb85212a6c8fdff640d9a14e4f682dc71fe2d28 Mon Sep 17 00:00:00 2001 From: yannis <yannisbarlas@gmail.com> Date: Mon, 4 Dec 2017 20:34:46 +0200 Subject: [PATCH] prettier dashboard sections --- .../src/components/sections/Divider.js | 4 +- .../src/components/sections/EditorItem.js | 54 +++++++++---------- .../src/components/sections/OwnerItem.js | 26 ++++----- .../src/components/sections/ReviewerItem.js | 27 +++++++--- .../src/components/sections/VersionTitle.js | 11 ++-- 5 files changed, 63 insertions(+), 59 deletions(-) diff --git a/packages/component-dashboard/src/components/sections/Divider.js b/packages/component-dashboard/src/components/sections/Divider.js index aef6dda9e..0f64884bb 100644 --- a/packages/component-dashboard/src/components/sections/Divider.js +++ b/packages/component-dashboard/src/components/sections/Divider.js @@ -2,7 +2,5 @@ import React from 'react' import classes from './Divider.local.scss' export default ({ separator }) => ( - <span className={classes.root}> - {' ' + separator + ' '} - </span> + <span className={classes.root}>{' ' + separator + ' '}</span> ) diff --git a/packages/component-dashboard/src/components/sections/EditorItem.js b/packages/component-dashboard/src/components/sections/EditorItem.js index 84e91ed6e..bac28d3f5 100644 --- a/packages/component-dashboard/src/components/sections/EditorItem.js +++ b/packages/component-dashboard/src/components/sections/EditorItem.js @@ -14,34 +14,33 @@ import VersionTitle from './VersionTitle' const EditorItem = ({ AssignEditor, project, version, addUserToTeam }) => ( <div className={classes.root}> <div className={classes.header}> - <Status status={project.status}/> + <Status status={project.status} /> <div className={classes.meta}> - <MetadataOwners owners={project.owners}/> - <Divider separator="–"/> - <MetadataSubmittedDate submitted={version.submitted}/> - <Divider separator="–"/> - <MetadataType type={version.metadata.articleType}/> - <Divider separator="–"/> - <MetadataSections sections={version.metadata.articleSection}/> - <Divider separator="–"/> - <MetadataReviewType openReview={version.declarations.openReview}/> + <MetadataOwners owners={project.owners} /> + <Divider separator="–" /> + <MetadataSubmittedDate submitted={version.submitted} /> + <Divider separator="–" /> + <MetadataType type={version.metadata.articleType} /> + <Divider separator="–" /> + <MetadataSections sections={version.metadata.articleSection} /> + <Divider separator="–" /> + <MetadataReviewType openReview={version.declarations.openReview} /> </div> </div> <div className={classes.main}> - <VersionTitle version={version} className={classes.versionTitle}/> + <VersionTitle version={version} className={classes.versionTitle} /> <div className={classes.links}> <div className={classes.link}> {(!version.decision || version.decision.status !== 'submitted') && ( <span> - <ProjectLink - project={project} - version={version} - page="reviewers">Assign Reviewers</ProjectLink> + <ProjectLink project={project} version={version} page="reviewers"> + Assign Reviewers + </ProjectLink> - <Divider separator="|"/> + <Divider separator="|" /> </span> )} @@ -49,39 +48,38 @@ const EditorItem = ({ AssignEditor, project, version, addUserToTeam }) => ( project={project} version={version} page="decisions" - id={project.id}> - {version.decision && version.decision.status === 'submitted' - ? `Decision: ${version.decision.recommendation}` - : 'Make decision'} + id={project.id} + > + {version.decision && version.decision.status === 'submitted' + ? `Decision: ${version.decision.recommendation}` + : 'Make decision'} </ProjectLink> </div> </div> - <div className={classes.actions}/> + <div className={classes.actions} /> </div> - - <div className={classes.roles}> <div className={classes.role}> <AssignEditor project={project} teamTypeName="seniorEditor" - addUserToTeam={addUserToTeam}/> + addUserToTeam={addUserToTeam} + /> </div> <div className={classes.role}> <AssignEditor project={project} teamTypeName="handlingEditor" - addUserToTeam={addUserToTeam}/> + addUserToTeam={addUserToTeam} + /> </div> </div> <div className={classes.reviews}> - <Reviews - project={project} - version={version}/> + <Reviews project={project} version={version} /> </div> </div> ) diff --git a/packages/component-dashboard/src/components/sections/OwnerItem.js b/packages/component-dashboard/src/components/sections/OwnerItem.js index a2d3c7a49..c1836e4bc 100644 --- a/packages/component-dashboard/src/components/sections/OwnerItem.js +++ b/packages/component-dashboard/src/components/sections/OwnerItem.js @@ -8,37 +8,33 @@ import VersionTitle from './VersionTitle' const OwnerItem = ({ project, version, deleteProject }) => ( <div className={classes.root}> <div className={classes.header}> - <Status status={project.status}/> + <Status status={project.status} /> </div> <div className={classes.main}> - <VersionTitle version={version} className={classes.versionTitle}/> + <VersionTitle version={version} className={classes.versionTitle} /> <div className={classes.links}> <div className={classes.link}> - <ProjectLink - project={project} - version={version} - page="submit">Submission</ProjectLink> + <ProjectLink project={project} version={version} page="submit"> + Submission + </ProjectLink> </div> - <Divider separator="|"/> + <Divider separator="|" /> <div className={classes.link}> - <ProjectLink - project={project} - version={version} - page="manuscript">Manuscript</ProjectLink> + <ProjectLink project={project} version={version} page="manuscript"> + Manuscript + </ProjectLink> </div> - <Divider separator="|"/> + <Divider separator="|" /> <div className={classes.link}> - <a onClick={() => deleteProject(project)} >Delete</a> + <a onClick={() => deleteProject(project)}>Delete</a> </div> - </div> - </div> </div> ) diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.js b/packages/component-dashboard/src/components/sections/ReviewerItem.js index 4fca6b3d1..74e2ec261 100644 --- a/packages/component-dashboard/src/components/sections/ReviewerItem.js +++ b/packages/component-dashboard/src/components/sections/ReviewerItem.js @@ -16,7 +16,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => { return ( <div className={classes.root}> <div className={classes.main}> - <VersionTitle version={version} className={classes.versionTitle}/> + <VersionTitle version={version} className={classes.versionTitle} /> {reviewer && ( <div> @@ -27,7 +27,8 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => { project={project} version={version} page="reviews" - id={reviewer.id}> + id={reviewer.id} + > {reviewer.submitted ? 'Reviewed' : 'Do Review'} </ProjectLink> </div> @@ -37,20 +38,30 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => { {reviewer.status === 'invited' && ( <div className={classes.actions}> <div className={classes.action}> - <Button onClick={() => reviewerResponse(project, version, reviewer, 'accepted')}>accept</Button> + <Button + onClick={() => + reviewerResponse(project, version, reviewer, 'accepted') + } + > + accept + </Button> </div> - <Divider separator="|"/> + <Divider separator="|" /> <div className={classes.action}> - <Button onClick={() => reviewerResponse(project, version, reviewer, 'declined')}>reject</Button> + <Button + onClick={() => + reviewerResponse(project, version, reviewer, 'declined') + } + > + reject + </Button> </div> </div> )} - {reviewer.status === 'declined' && ( - <div>declined</div> - )} + {reviewer.status === 'declined' && <div>declined</div>} </div> )} </div> diff --git a/packages/component-dashboard/src/components/sections/VersionTitle.js b/packages/component-dashboard/src/components/sections/VersionTitle.js index a8240b6ae..d02f9ebd1 100644 --- a/packages/component-dashboard/src/components/sections/VersionTitle.js +++ b/packages/component-dashboard/src/components/sections/VersionTitle.js @@ -1,18 +1,19 @@ import React from 'react' // import {TitleViewer} from 'xpub-edit/src/components' -export default ({version, className}) => { +export default ({ version, className }) => { // <TitleViewer // value={version && version.metadata && version.metadata.title || 'Untitled'} // className={className}/> - const title = version && version.metadata && version.metadata.title - ? version.metadata.title - : 'Untitled' + const title = + version && version.metadata && version.metadata.title + ? version.metadata.title + : 'Untitled' return ( <div className={className}> <span>{title}</span> </div> ) -} \ No newline at end of file +} -- GitLab