adding episodes to projects

2 files changed, 21 insertions, 11 deletions

diff --git a/animism-align/frontend/app/views/nav/header.component.js b/animism-align/frontend/app/views/nav/header.component.js
index bc04629..c90e592 100644
--- a/animism-align/frontend/app/views/nav/header.component.js
+++ b/animism-align/frontend/app/views/nav/header.component.js
@@ -14,30 +14,35 @@ function Header(props) {
     return null
   }
   if (props.router.location.pathname.match("/editor")) {
-    const { episode_id } = this.props.match.params
+    const episode_id = props.router.location.pathname.split('/')[1]
     return (
       <header>
-        <PlayButton playing={props.playing} />
         <div>
-          <Link to={`/`}>{'<'}</Link>
+          <PlayButton playing={props.playing} />
+          <Link to="/">Home</Link>
+        </div>
+        <div>
           <Link to={`/editor/${episode_id}/timeline/`}>Timeline</Link>
           <Link to={`/editor/${episode_id}/transcript/`}>Transcript</Link>
           <Link to={`/editor/${episode_id}/media/`}>Media</Link>
           <Link to={`/editor/${episode_id}/viewer/`}>Viewer</Link>
-          <Link to="/episode/">Episodes</Link>
-          <Link to="/venue/">Venues</Link>
         </div>
       </header>
     )
   }
   return (
     <header>
-      <PlayButton playing={props.playing} />
       <div>
-        <Link to="/project/">Projects</Link>
-        <Link to="/episode/">Episodes</Link>
-        <Link to="/venue/">Venues</Link>
-        {props.currentUser.is_admin && <Link to="/users">Users</Link>}
+        <PlayButton playing={props.playing} />
+        {props.router.location.pathname !== '/' && (
+          <Link to="/">Home</Link>
+        )}
+      </div>
+      <div>
+        <span className='salutation'>
+          Hi {props.currentUser.username}
+        </span>
+        {props.currentUser.is_admin && <Link to="/users/">Users</Link>}
         <a href="#" onClick={actions.auth.logout}>
           Logout
         </a>
diff --git a/animism-align/frontend/app/views/nav/nav.css b/animism-align/frontend/app/views/nav/nav.css
index 485ace2..0c9a992 100644
--- a/animism-align/frontend/app/views/nav/nav.css
+++ b/animism-align/frontend/app/views/nav/nav.css
@@ -25,7 +25,7 @@ header > div:first-child {
   display: flex;
   justify-content: flex-start;
   align-items: center;
-  padding-left: 1.5rem;
+  padding-left: 0.5rem;
 }
 header > div:last-child {
   padding-right: 1.5rem;
@@ -70,4 +70,9 @@ header a.navbar-brand {
 
 header .username {
   cursor: pointer;
+}
+header .salutation {
+  color: #888;
+  font-style: italic;
+  margin: 0 1rem;
 }
\ No newline at end of file