From 8087a3fcb3fa0d63470e5e390c62360a9f9815a2 Mon Sep 17 00:00:00 2001
From: Andrew Nicolaou <me@andrewnicolaou.co.uk>
Date: Wed, 15 Jan 2020 18:10:51 +0100
Subject: [PATCH] Revert "Make navigation back to Collection List more obvious"

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

diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
index 4571c93d..3886ccc8 100644
--- a/client/components/Nav.jsx
+++ b/client/components/Nav.jsx
@@ -230,22 +230,16 @@ 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={logoUrl} alt="p5.js logo" className="svg__logo" />
+            <InlineSVG src={caretLeft} className="nav__back-icon" />
+            <span className="nav__item-header">
+              Back to Editor
+            </span>
           </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>
     );
   }
@@ -721,7 +715,6 @@ Nav.propTypes = {
     username: PropTypes.string,
     id: PropTypes.string
   }).isRequired,
-  ownerName: PropTypes.string,
   project: PropTypes.shape({
     id: PropTypes.string,
     owner: PropTypes.shape({
@@ -759,8 +752,7 @@ Nav.defaultProps = {
   },
   cmController: {},
   layout: 'project',
-  warnIfUnsavedChanges: undefined,
-  ownerName: null,
+  warnIfUnsavedChanges: undefined
 };
 
 function mapStateToProps(state) {
diff --git a/client/modules/User/pages/CollectionView.jsx b/client/modules/User/pages/CollectionView.jsx
index 31960809..c402539c 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" ownerName={this.ownerName()} />
+        <Nav layout="dashboard" />
 
         {this.renderContent()}
       </div>