2 files changed, 10 insertions, 24 deletions
diff --git a/animism-align/frontend/app/views/venue/components/venue.form.js b/animism-align/frontend/app/views/venue/components/venue.form.js
index b1a124f..7ffa098 100644
--- a/animism-align/frontend/app/views/venue/components/venue.form.js
+++ b/animism-align/frontend/app/views/venue/components/venue.form.js
@@ -111,8 +111,8 @@ export default class VenueForm extends Component {
     }
     const { isNew, onSubmit } = this.props
     const { data } = this.state
-    const requiredKeys = "title date".split(" ")
-    const validKeys = "title date settings".split(" ")
+    const requiredKeys = "project_id title date".split(" ")
+    const validKeys = "project_id title date settings".split(" ")
     const validData = validKeys.reduce((a,b) => { a[b] = data[b]; return a }, {})
     const errorFields = requiredKeys.filter(key => !validData[key])
     if (errorFields.length) {
@@ -132,7 +132,6 @@ export default class VenueForm extends Component {
   render() {
     const { isNew } = this.props
     const { title, submitTitle, errorFields, data } = this.state
-    // console.log(data)
     return (
       <div className='form'>
         <h1>{title}</h1>
diff --git a/animism-align/frontend/app/views/venue/components/venue.menu.js b/animism-align/frontend/app/views/venue/components/venue.menu.js
index 1e1a7cd..c76edf6 100644
--- a/animism-align/frontend/app/views/venue/components/venue.menu.js
+++ b/animism-align/frontend/app/views/venue/components/venue.menu.js
@@ -14,43 +14,30 @@ export default class VenueMenu extends Component {
   render() {
     return (
       <div className='menuButtons'>
-        <Route exact path='/venue/:id/show/' component={VenueShowMenu} />
         <Route exact path='/venue/:id/edit/' component={VenueEditMenu} />
-        <Route exact path='/venue/new/' component={VenueNewMenu} />
-        <Route exact path='/venue/' component={VenueIndexMenu} />
+        <Route exact path='/project/:project_id/new-venue/' component={VenueNewMenu} />
+        <Route exact path='/project/:project_id/venues/' component={VenueIndexMenu} />
       </div>
     )
   }
 }
 
-const VenueIndexMenu = () => ([
-  <MenuButton key='new' name="new" href="/venue/new/" />,
+const VenueIndexMenu = (props) => ([
+  <MenuButton key='back' name="back" href={`/`} />,
+  <MenuButton key='new' name="new" href={`/project/${props.match.params.project_id}/new-venue/`} />,
 ])
 
-const VenueShowMenu = connect(mapStateToProps)((props) => ([
-  <MenuButton key='back' name="back" href="/venue/" />,
-  <MenuButton key='edit' name="edit" href={"/venue/" + props.match.params.id + "/edit/"} />,
-  <MenuButton key='delete' name="delete" onClick={() => {
-    const { res: venue } = props.venue.show
-    if (confirm("Really delete this venue?")) {
-      actions.venue.destroy(venue).then(() => {
-        history.push('/venue/')
-      })
-    }
-  }} />,
-]))
-
 const VenueNewMenu = (props) => ([
-  <MenuButton key='back' name="back" href="/venue/" />,
+  <MenuButton key='back' name="back" href={`/project/${props.match.params.project_id}/new-venue/`} />,
 ])
 
 const VenueEditMenu = connect(mapStateToProps)((props) => ([
-  <MenuButton key='back' name="back" href="/venue/" />,
+  <MenuButton key='back' name="back" href={`/project/${props.match.params.project_id}/venues/`} />,
   <MenuButton key='delete' name="delete" onClick={() => {
     const { res: venue } = props.venue.show
     if (confirm("Really delete this venue?")) {
       actions.venue.destroy(venue).then(() => {
-        history.push('/venue/')
+        history.push(`/project/${props.match.params.project_id}/venues/`)
       })
     }
   }} />,