Merge pull request #12 from atlarge-research/feature/scenario-plots

Plotting of portfolio results

4 files changed, 20 insertions, 40 deletions

diff --git a/frontend/src/components/projects/NewProjectButtonComponent.js b/frontend/src/components/projects/NewProjectButtonComponent.js
index 3ddef5e5..312671c6 100644
--- a/frontend/src/components/projects/NewProjectButtonComponent.js
+++ b/frontend/src/components/projects/NewProjectButtonComponent.js
@@ -4,7 +4,7 @@ import React from 'react'
 const NewProjectButtonComponent = ({ onClick }) => (
     <div className="bottom-btn-container">
         <div className="btn btn-primary float-right" onClick={onClick}>
-            <span className="fa fa-plus mr-2"/>
+            <span className="fa fa-plus mr-2" />
             New Project
         </div>
     </div>
diff --git a/frontend/src/components/projects/ProjectActionButtons.js b/frontend/src/components/projects/ProjectActionButtons.js
index 456dd6b6..1c76cc7f 100644
--- a/frontend/src/components/projects/ProjectActionButtons.js
+++ b/frontend/src/components/projects/ProjectActionButtons.js
@@ -4,26 +4,18 @@ import { Link } from 'react-router-dom'
 
 const ProjectActionButtons = ({ projectId, onViewUsers, onDelete }) => (
     <td className="text-right">
-        <Link
-            to={'/projects/' + projectId}
-            className="btn btn-outline-primary btn-sm mr-2"
-            title="Open this project"
-        >
-            <span className="fa fa-play"/>
+        <Link to={'/projects/' + projectId} className="btn btn-outline-primary btn-sm mr-2" title="Open this project">
+            <span className="fa fa-play" />
         </Link>
         <div
             className="btn btn-outline-success btn-sm disabled mr-2"
             title="View and edit collaborators (not supported currently)"
             onClick={() => onViewUsers(projectId)}
         >
-            <span className="fa fa-users"/>
+            <span className="fa fa-users" />
         </div>
-        <div
-            className="btn btn-outline-danger btn-sm"
-            title="Delete this project"
-            onClick={() => onDelete(projectId)}
-        >
-            <span className="fa fa-trash"/>
+        <div className="btn btn-outline-danger btn-sm" title="Delete this project" onClick={() => onDelete(projectId)}>
+            <span className="fa fa-trash" />
         </div>
     </td>
 )
diff --git a/frontend/src/components/projects/ProjectAuthList.js b/frontend/src/components/projects/ProjectAuthList.js
index 5a2c6695..8eb4f93b 100644
--- a/frontend/src/components/projects/ProjectAuthList.js
+++ b/frontend/src/components/projects/ProjectAuthList.js
@@ -8,27 +8,23 @@ const ProjectAuthList = ({ authorizations }) => {
         <div className="vertically-expanding-container">
             {authorizations.length === 0 ? (
                 <div className="alert alert-info">
-                    <span className="info-icon fa fa-question-circle mr-2"/>
-                    <strong>No projects here yet...</strong> Add some with the 'New
-                    Project' button!
+                    <span className="info-icon fa fa-question-circle mr-2" />
+                    <strong>No projects here yet...</strong> Add some with the 'New Project' button!
                 </div>
             ) : (
                 <table className="table table-striped">
                     <thead>
-                    <tr>
-                        <th>Project name</th>
-                        <th>Last edited</th>
-                        <th>Access rights</th>
-                        <th/>
-                    </tr>
+                        <tr>
+                            <th>Project name</th>
+                            <th>Last edited</th>
+                            <th>Access rights</th>
+                            <th />
+                        </tr>
                     </thead>
                     <tbody>
-                    {authorizations.map(authorization => (
-                        <ProjectAuthRow
-                            projectAuth={authorization}
-                            key={authorization.project._id}
-                        />
-                    ))}
+                        {authorizations.map((authorization) => (
+                            <ProjectAuthRow projectAuth={authorization} key={authorization.project._id} />
+                        ))}
                     </tbody>
                 </table>
             )}
diff --git a/frontend/src/components/projects/ProjectAuthRow.js b/frontend/src/components/projects/ProjectAuthRow.js
index be9de6e0..3f904061 100644
--- a/frontend/src/components/projects/ProjectAuthRow.js
+++ b/frontend/src/components/projects/ProjectAuthRow.js
@@ -8,20 +8,12 @@ import { parseAndFormatDateTime } from '../../util/date-time'
 const ProjectAuthRow = ({ projectAuth }) => (
     <tr>
         <td className="pt-3">{projectAuth.project.name}</td>
+        <td className="pt-3">{parseAndFormatDateTime(projectAuth.project.datetimeLastEdited)}</td>
         <td className="pt-3">
-            {parseAndFormatDateTime(projectAuth.project.datetimeLastEdited)}
-        </td>
-        <td className="pt-3">
-      <span
-          className={classNames(
-              'fa',
-              'fa-' + AUTH_ICON_MAP[projectAuth.authorizationLevel],
-              'mr-2',
-          )}
-      />
+            <span className={classNames('fa', 'fa-' + AUTH_ICON_MAP[projectAuth.authorizationLevel], 'mr-2')} />
             {AUTH_DESCRIPTION_MAP[projectAuth.authorizationLevel]}
         </td>
-        <ProjectActions projectId={projectAuth.project._id}/>
+        <ProjectActions projectId={projectAuth.project._id} />
     </tr>
 )