From 740401d18b96df8b6fe152f2f547d209537caee1 Mon Sep 17 00:00:00 2001
From: Andrew Nicolaou <me@andrewnicolaou.co.uk>
Date: Wed, 11 Dec 2019 14:57:19 +0100
Subject: [PATCH] Make navigation back to Collection List more obvious

---
 client/components/Nav.jsx                    | 24 +++++++++++++-------
 client/modules/User/pages/CollectionView.jsx |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
index 3886ccc8..4571c93d 100644
--- a/client/components/Nav.jsx
+++ b/client/components/Nav.jsx
@@ -230,16 +230,22 @@ class Nav extends React.PureComponent {
     return (
       <ul className="nav__items-left" title="project-menu">
         <li className="nav__item-logo">
-          <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
-        </li>
-        <li className="nav__item nav__item--no-icon">
           <Link to="/" className="nav__back-link">
-            <InlineSVG src={caretLeft} className="nav__back-icon" />
-            <span className="nav__item-header">
-              Back to Editor
-            </span>
+            <InlineSVG src={logoUrl} alt="p5.js logo" className="svg__logo" />
           </Link>
         </li>
+        {
+          this.props.ownerName && (
+            <li className="nav__item nav__item--no-icon">
+              <Link to={`/${this.props.ownerName}/collections`} className="nav__back-link">
+                <InlineSVG src={caretLeft} className="nav__back-icon" />
+                <span className="nav__item-header">
+                Collections
+                </span>
+              </Link>
+            </li>
+          )
+        }
       </ul>
     );
   }
@@ -715,6 +721,7 @@ Nav.propTypes = {
     username: PropTypes.string,
     id: PropTypes.string
   }).isRequired,
+  ownerName: PropTypes.string,
   project: PropTypes.shape({
     id: PropTypes.string,
     owner: PropTypes.shape({
@@ -752,7 +759,8 @@ Nav.defaultProps = {
   },
   cmController: {},
   layout: 'project',
-  warnIfUnsavedChanges: undefined
+  warnIfUnsavedChanges: undefined,
+  ownerName: null,
 };
 
 function mapStateToProps(state) {
diff --git a/client/modules/User/pages/CollectionView.jsx b/client/modules/User/pages/CollectionView.jsx
index c402539c..31960809 100644
--- a/client/modules/User/pages/CollectionView.jsx
+++ b/client/modules/User/pages/CollectionView.jsx
@@ -56,7 +56,7 @@ class CollectionView extends React.Component {
   render() {
     return (
       <div className="dashboard">
-        <Nav layout="dashboard" />
+        <Nav layout="dashboard" ownerName={this.ownerName()} />
 
         {this.renderContent()}
       </div>