diff options
Diffstat (limited to 'animism-align/frontend/app/views/project')
5 files changed, 12 insertions, 7 deletions
diff --git a/animism-align/frontend/app/views/project/components/project.form.js b/animism-align/frontend/app/views/project/components/project.form.js index f4d1749..0393d81 100644 --- a/animism-align/frontend/app/views/project/components/project.form.js +++ b/animism-align/frontend/app/views/project/components/project.form.js @@ -110,7 +110,7 @@ export default class ProjectForm extends Component { } const { isNew, onSubmit } = this.props const { data } = this.state - const requiredKeys = "title is_live".split(" ") + const requiredKeys = "title".split(" ") const validKeys = "title is_live settings".split(" ") const validData = validKeys.reduce((a,b) => { a[b] = data[b]; return a }, {}) if (!data.title) { @@ -173,21 +173,24 @@ export default class ProjectForm extends Component { title="Base URL" name="base_href" data={data.settings} + placeholder="https://animism.e-flux.com" onChange={this.handleSettingsChangeEvent} autoComplete="off" /> <TextInput title="FTP URL" name="ftp_url" + placeholder="ftp://..." data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> <TextInput - title="FTP Base Path" + title="FTP Local Path" name="ftp_base_path" data={data.settings} + placeholder="./data_store/exports/animism" onChange={this.handleSettingsChangeEvent} autoComplete="off" /> diff --git a/animism-align/frontend/app/views/project/components/project.menu.js b/animism-align/frontend/app/views/project/components/project.menu.js index a29a451..8e3abea 100644 --- a/animism-align/frontend/app/views/project/components/project.menu.js +++ b/animism-align/frontend/app/views/project/components/project.menu.js @@ -28,7 +28,7 @@ const ProjectIndexMenu = () => ([ ]) const ProjectShowMenu = connect(mapStateToProps)((props) => ([ - <MenuButton key='back' name="back" href="/project/" />, + <MenuButton key='back' name="back" href="/" />, <MenuButton key='edit' name="edit" href={"/project/" + props.match.params.id + "/edit/"} />, <MenuButton key='delete' name="delete" onClick={() => { const { res: project } = props.project.show @@ -41,11 +41,11 @@ const ProjectShowMenu = connect(mapStateToProps)((props) => ([ ])) const ProjectNewMenu = (props) => ([ - <MenuButton key='back' name="back" href="/project/" />, + <MenuButton key='back' name="back" href="/" />, ]) const ProjectEditMenu = connect(mapStateToProps)((props) => ([ - <MenuButton key='back' name="back" href="/project/" />, + <MenuButton key='back' name="back" href="/" />, <MenuButton key='delete' name="delete" onClick={() => { const { res: project } = props.project.show if (confirm("Really delete this project?")) { diff --git a/animism-align/frontend/app/views/project/containers/project.edit.js b/animism-align/frontend/app/views/project/containers/project.edit.js index dbb384d..b0b7bef 100644 --- a/animism-align/frontend/app/views/project/containers/project.edit.js +++ b/animism-align/frontend/app/views/project/containers/project.edit.js @@ -20,7 +20,7 @@ class ProjectEdit extends Component { .then(response => { // response console.log(response) - history.push('/project/') + history.push('/') }) } diff --git a/animism-align/frontend/app/views/project/containers/project.new.js b/animism-align/frontend/app/views/project/containers/project.new.js index c8a2152..149ee67 100644 --- a/animism-align/frontend/app/views/project/containers/project.new.js +++ b/animism-align/frontend/app/views/project/containers/project.new.js @@ -24,7 +24,7 @@ class ProjectNew extends Component { .then(res => { console.log(res) if (res.res && res.res.id) { - history.push('/project/') + history.push('/') } }) .catch(err => { diff --git a/animism-align/frontend/app/views/project/project.container.js b/animism-align/frontend/app/views/project/project.container.js index 0fba8c9..a3701e2 100644 --- a/animism-align/frontend/app/views/project/project.container.js +++ b/animism-align/frontend/app/views/project/project.container.js @@ -3,6 +3,7 @@ import { Route } from 'react-router-dom' import './project.css' +import EpisodeNew from 'app/views/episode/containers/episode.new' import ProjectIndex from './containers/project.index' import ProjectNew from './containers/project.new' import ProjectEdit from './containers/project.edit' @@ -11,6 +12,7 @@ export default class Container extends Component { render() { return ( <div className='projectContainer'> + <Route exact path='/project/:project_id/new-episode/' component={EpisodeNew} /> <Route exact path='/project/:id/edit/' component={ProjectEdit} /> <Route exact path='/project/new/' component={ProjectNew} /> <Route exact path='/project/' component={ProjectIndex} /> |