aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorThomas Haddad2017-01-17 16:21:24 +0100
committerThomas Haddad2017-01-17 16:22:49 +0100
commit94d5b4516dafe0b07c9c5fe7cdb27bef1a3e9469 (patch)
tree63b0fb448ad0d31163ef9e6d301a5edfb047b5bd /app/assets/javascripts
parent4edcbc0e87db1b2d1d32b83c4ef4dfb96193ae43 (diff)
downloadchouette-core-94d5b4516dafe0b07c9c5fe7cdb27bef1a3e9469.tar.bz2
Refs #2403: Add OlMap container/component/reducer
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js20
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js4
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/containers/OlMap.js15
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/index.js20
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/reducers/index.js4
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/reducers/olMap.js8
6 files changed, 62 insertions, 9 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
new file mode 100644
index 000000000..a0135bb3c
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
@@ -0,0 +1,20 @@
+var React = require('react')
+var Component = require('react').Component
+var PropTypes = require('react').PropTypes
+
+class OlMap extends Component{
+ constructor(props){
+ super(props)
+ }
+ componentDidMount() {
+ }
+
+ render() {
+ return <div></div>
+ }
+}
+
+OlMap.propTypes = {
+}
+
+module.exports = OlMap
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
index 492693a6d..eee3a05f8 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
@@ -1,6 +1,7 @@
var React = require('react')
var PropTypes = require('react').PropTypes
var BSelect2 = require('./BSelect2')
+var OlMap = require('./OlMap')
const StopPoint = (props) => {
return (
@@ -68,6 +69,9 @@ const StopPoint = (props) => {
</div>
</div>
</div>
+ <div>
+ <OlMap />
+ </div>
</div>
)
}
diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/containers/OlMap.js
new file mode 100644
index 000000000..369795a39
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/OlMap.js
@@ -0,0 +1,15 @@
+var actions = require('../actions')
+var connect = require('react-redux').connect
+
+const mapStateToProps = (state) => {
+}
+
+const mapDispatchToProps = (dispatch) => {
+}
+
+const OlMap = connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(StopPointList)
+
+module.exports = OlMap
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index 16e3bb2c2..ee78bc7a9 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -7,10 +7,10 @@ var App = require('./components/App')
var addInput = require('./form_helper')
// logger, DO NOT REMOVE
-// var applyMiddleware = require('redux').applyMiddleware
-// var createLogger = require('redux-logger')
-// var thunkMiddleware = require('redux-thunk').default
-// var promise = require('redux-promise')
+var applyMiddleware = require('redux').applyMiddleware
+var createLogger = require('redux-logger')
+var thunkMiddleware = require('redux-thunk').default
+var promise = require('redux-promise')
const getInitialState = () => {
let state = []
@@ -30,18 +30,22 @@ const getInitialState = () => {
zip_code: value.zip_code,
text: fancyText,
for_boarding: value.for_boarding || "normal",
- for_alighting: value.for_alighting || "normal"
+ for_alighting: value.for_alighting || "normal",
+ olMap:{
+ isOpened: false,
+ json: {},
+ }
})
}
return state
}
var initialState = {stopPoints: getInitialState()}
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
let store = createStore(
reducers,
- initialState
- // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+ initialState,
+ applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
)
render(
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
index 446c9ed36..bf20aacf7 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
@@ -1,8 +1,10 @@
var combineReducers = require('redux').combineReducers
var stopPoints = require('./stopPoints')
+var olMap = require('./olMap')
const stopPointsApp = combineReducers({
- stopPoints
+ stopPoints,
+ olMap
})
module.exports = stopPointsApp
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/olMap.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/olMap.js
new file mode 100644
index 000000000..346420cde
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/olMap.js
@@ -0,0 +1,8 @@
+const olMap = (state = {}, action) => {
+ switch (action.type) {
+ default:
+ return state
+ }
+}
+
+module.exports = olMap