From ac135c27923e508073c36f63b9e81000759cd081 Mon Sep 17 00:00:00 2001
From: Tomasz Knapik <hi@tmkn.org>
Date: Wed, 9 Jan 2019 15:56:34 +0000
Subject: [PATCH] Initial setup of the submissions by round
---
.../templates/funds/submissions_by_round.html | 4 ++--
opentech/static_src/src/app/src/App.scss | 0
.../src/{App.js => SubmissionsByRoundApp.js} | 18 ++++++++++++------
.../containers/SubmissionsByRoundContainer.js | 11 +++++++++++
opentech/static_src/src/app/src/index.js | 6 +++---
.../static_src/src/app/webpack.base.config.js | 6 +++++-
6 files changed, 33 insertions(+), 12 deletions(-)
delete mode 100644 opentech/static_src/src/app/src/App.scss
rename opentech/static_src/src/app/src/{App.js => SubmissionsByRoundApp.js} (53%)
create mode 100644 opentech/static_src/src/app/src/containers/SubmissionsByRoundContainer.js
diff --git a/opentech/apply/funds/templates/funds/submissions_by_round.html b/opentech/apply/funds/templates/funds/submissions_by_round.html
index 2fc557260..f45fec8e6 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 e69de29bb..000000000
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 5382959cb..bb4c16f09 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 000000000..17d54bace
--- /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 fc13e8934..385ead375 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 f96f05863..9c1fc882e 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'),
+ }
}
};
--
GitLab