diff --git a/opentech/apply/funds/templates/funds/submissions_by_round.html b/opentech/apply/funds/templates/funds/submissions_by_round.html index 2fc5572602cfa1efc6eacb468c24c9c795dbf7a8..f45fec8e6c5b5d5d8df8fef4b4280cadd8eea215 100644 --- a/opentech/apply/funds/templates/funds/submissions_by_round.html +++ b/opentech/apply/funds/templates/funds/submissions_by_round.html @@ -11,11 +11,11 @@ <h1 class="gamma heading heading--no-margin heading--bold">{{ object }}</h1> <h5>{% if object.fund %}{{ object.fund }} | {% endif %}Lead: {{ object.lead }}</h5> </div> - <div id="react-switcher"></div> + <div id="submissions-by-round-app-react-switcher"></div> </div> </div> - <div id="react-app"> + <div id="submissions-by-round-react-app"> <div class="wrapper wrapper--large wrapper--inner-space-medium"> {% block table %} {{ block.super }} diff --git a/opentech/static_src/src/app/src/App.scss b/opentech/static_src/src/app/src/App.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/opentech/static_src/src/app/src/App.js b/opentech/static_src/src/app/src/SubmissionsByRoundApp.js similarity index 53% rename from opentech/static_src/src/app/src/App.js rename to opentech/static_src/src/app/src/SubmissionsByRoundApp.js index 5382959cbfc5a2b0ca48d337c4c58ef9f3f8f788..bb4c16f0959db95aa67c9e68459618bda1c01aaf 100644 --- a/opentech/static_src/src/app/src/App.js +++ b/opentech/static_src/src/app/src/SubmissionsByRoundApp.js @@ -1,10 +1,10 @@ import React from 'react'; import { hot } from 'react-hot-loader' -import Switcher from './components/Switcher' -import './App.scss'; +import Switcher from '@components/Switcher' +import SubmissionsByRoundContainer from '@containers/SubmissionsByRoundContainer'; -class App extends React.Component { +class SubmissionsByRoundApp extends React.Component { constructor(props) { super(props); @@ -26,13 +26,19 @@ class App extends React.Component { render() { return ( <> - <Switcher selector='react-switcher' open={this.state.detailOpen} handleOpen={this.detailOpen} handleClose={this.detailClose} /> + <Switcher selector='submissions-by-round-app-react-switcher' open={this.state.detailOpen} handleOpen={this.detailOpen} handleClose={this.detailClose} /> <div style={this.state.style} ref={this.setOriginalContentRef} dangerouslySetInnerHTML={{ __html: this.props.pageContent }} /> - {this.state.detailOpen && <div><h2>THIS IS REACT</h2></div>} + {this.state.detailOpen && this.renderSubmissionsByRound()} </> ) } + + renderSubmissionsByRound() { + return <div> + <SubmissionsByRoundContainer /> + </div>; + } } -export default hot(module)(App) +export default hot(module)(SubmissionsByRoundApp) diff --git a/opentech/static_src/src/app/src/containers/SubmissionsByRoundContainer.js b/opentech/static_src/src/app/src/containers/SubmissionsByRoundContainer.js new file mode 100644 index 0000000000000000000000000000000000000000..17d54bace051b72e27c1803a487aedacfc134b52 --- /dev/null +++ b/opentech/static_src/src/app/src/containers/SubmissionsByRoundContainer.js @@ -0,0 +1,11 @@ +import React from 'react'; + +export default class SubmissionsByRoundContainer extends React.Component { + render() { + return ( + <div> + <h2>Submissions by round container</h2> + </div> + ); + } +} diff --git a/opentech/static_src/src/app/src/index.js b/opentech/static_src/src/app/src/index.js index fc13e89343078cb163670fd80e7886d33459b815..385ead37510a5aa19d4af0cbc86efab9b199eeb1 100644 --- a/opentech/static_src/src/app/src/index.js +++ b/opentech/static_src/src/app/src/index.js @@ -1,13 +1,13 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import App from './App' +import SubmissionsByRoundApp from './SubmissionsByRoundApp' -const container = document.getElementById('react-app'); +const container = document.getElementById('submissions-by-round-react-app'); ReactDOM.render( - <App pageContent={container.innerHTML} />, + <SubmissionsByRoundApp pageContent={container.innerHTML} />, container ); diff --git a/opentech/static_src/src/app/webpack.base.config.js b/opentech/static_src/src/app/webpack.base.config.js index f96f05863d43d702bdf904715b61e0e6e943a90f..9c1fc882e26be5a01478267e139674409364a07c 100644 --- a/opentech/static_src/src/app/webpack.base.config.js +++ b/opentech/static_src/src/app/webpack.base.config.js @@ -55,6 +55,10 @@ module.exports = { resolve: { modules: ['node_modules', './src'], - extensions: ['.js', '.jsx'] + extensions: ['.js', '.jsx'], + alias: { + '@components': path.resolve(__dirname, 'src/components'), + '@containers': path.resolve(__dirname, 'src/containers'), + } } };