From 04f7efe6c05153cbd1613e7b0c78b3b6478ae39b Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 2 Jun 2020 20:25:23 +0200 Subject: new page form --- frontend/views/graph/graph.container.js | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'frontend/views/graph/graph.container.js') diff --git a/frontend/views/graph/graph.container.js b/frontend/views/graph/graph.container.js index 40e2e6a..5646d71 100644 --- a/frontend/views/graph/graph.container.js +++ b/frontend/views/graph/graph.container.js @@ -10,7 +10,11 @@ import { Loader } from '../../common' // import * as uploadActions from './upload.actions' -// import GraphIndex from './containers/graph.index' +import PageNew from './components/page.new' +import PageEdit from './components/page.edit' + +import GraphHeader from './components/graph.header' +import GraphEditor from './components/graph.editor' class GraphContainer extends Component { componentDidMount() { @@ -39,22 +43,32 @@ class GraphContainer extends Component { } render() { if (!this.shouldShowGraph()) return null - if (this.props.graph.show.loading) { + if (!this.props.graph.show.res || this.props.graph.show.loading) { return ( -
- +
+ +
+
+ +
+
) } - console.log(this.props.graph.show) return ( -
+
+ +
+ + {this.props.graph.editor.addingPage && } + {this.props.graph.editor.editingPage && } +
) } } - // +// const mapStateToProps = state => ({ graph: state.graph, }) -- cgit v1.2.3-70-g09d2