aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorThomas Haddad2017-02-08 11:08:29 +0100
committerThomas Haddad2017-02-08 11:08:29 +0100
commit3e17d660064632335064b6784d1586a8d19af505 (patch)
tree2437badc2d1e68ba4d695857964ccb8d41806256 /app
parentccf0a60c83dad2bc18ac1ca9773e2b004587b967 (diff)
downloadchouette-core-3e17d660064632335064b6784d1586a8d19af505.tar.bz2
Refs #2498: Load redux app for vj and add state reducers
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js2
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/index.js4
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js12
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js8
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js8
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/status.js10
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js10
-rw-r--r--app/views/vehicle_journeys/index.html.slim3
8 files changed, 52 insertions, 5 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index 5c648e576..68ca27f03 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -1,4 +1,4 @@
const actions = {
}
-modules.export = actions
+module.exports = actions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 5c70192f7..839db18ec 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -16,7 +16,7 @@ var initialState = {
fetchSuccess: true,
isFetching: false
},
- journeyPatterns: [],
+ vehicleJourneys: [],
pagination: {
page : 1,
totalCount: window.journeyPatternLength,
@@ -41,5 +41,5 @@ render(
<Provider store={store}>
<App />
</Provider>,
- document.getElementById('vehicle_journeys')
+ document.getElementById('vehicle_journeys_wip')
)
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
index 79d95f838..613f46cc5 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/index.js
@@ -1,6 +1,14 @@
var combineReducers = require('redux').combineReducers
+var vehicleJourneys = require('./vehicleJourneys')
+var pagination = require('./pagination')
+var modal = require('./modal')
+var status = require('./status')
-const journeyPatternsApp = combineReducers({
+const vehicleJourneysApp = combineReducers({
+ vehicleJourneys,
+ pagination,
+ modal,
+ status
})
-module.exports = journeyPatternsApp
+module.exports = vehicleJourneysApp
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
new file mode 100644
index 000000000..e011164c5
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/modal.js
@@ -0,0 +1,8 @@
+const modal = (state = {}, action) => {
+ switch (action.type) {
+ default:
+ return state
+ }
+}
+
+module.exports = modal
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js
new file mode 100644
index 000000000..5ea7300dc
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/pagination.js
@@ -0,0 +1,8 @@
+const pagination = (state = {}, action) => {
+ switch (action.type) {
+ default:
+ return state
+ }
+}
+
+module.exports = pagination
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/status.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/status.js
new file mode 100644
index 000000000..fb23e97e7
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/status.js
@@ -0,0 +1,10 @@
+var actions = require("../actions")
+
+const status = (state = {}, action) => {
+ switch (action.type) {
+ default:
+ return state
+ }
+}
+
+module.exports = status
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
new file mode 100644
index 000000000..fb23e97e7
--- /dev/null
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js
@@ -0,0 +1,10 @@
+var actions = require("../actions")
+
+const status = (state = {}, action) => {
+ switch (action.type) {
+ default:
+ return state
+ }
+}
+
+module.exports = status
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index aa18a120f..9f177c086 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -43,6 +43,9 @@
- content_for :sidebar do
== render "sidebar"
+#vehicle_journeys_wip
+= javascript_include_tag 'es6_browserified/vehicle_journeys/index.js'
+
javascript:
$(function() {
var time_tables_url = function(){