aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2016-11-30 16:56:11 +0100
committerThomas Haddad2016-11-30 16:56:11 +0100
commit724690ea7d1bf4c0f8fd2c57dd0636fee3c6574f (patch)
treeb8ca4582b4249bc9f07c77b7fcc4fa4c5d3b8d4e
parent3ed5640f1de6e0f376338dddcc3527a2744ad10a (diff)
downloadchouette-core-724690ea7d1bf4c0f8fd2c57dd0636fee3c6574f.tar.bz2
Fix split itineraries and journey patterns for better understanding
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/actions/index.js (renamed from app/assets/javascripts/es6_browserified/actions/index.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/App.js (renamed from app/assets/javascripts/es6_browserified/components/App.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js (renamed from app/assets/javascripts/es6_browserified/components/BSelect2.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/Todo.js (renamed from app/assets/javascripts/es6_browserified/components/Todo.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/TodoList.js (renamed from app/assets/javascripts/es6_browserified/components/TodoList.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/containers/AddTodo.js (renamed from app/assets/javascripts/es6_browserified/containers/AddTodo.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/containers/VisibleTodoList.js (renamed from app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/form_helper.js (renamed from app/assets/javascripts/es6_browserified/form_helper.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/reducers/index.js (renamed from app/assets/javascripts/es6_browserified/reducers/index.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/reducers/todos.js (renamed from app/assets/javascripts/es6_browserified/reducers/todos.js)0
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/stop_points.js (renamed from app/assets/javascripts/es6_browserified/stop_points.js)0
-rw-r--r--app/views/routes/_form.html.slim2
-rw-r--r--spec/javascripts/actions_spec.js2
-rw-r--r--spec/javascripts/components_spec.js6
-rw-r--r--spec/javascripts/reducers_spec.js2
15 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/es6_browserified/actions/index.js b/app/assets/javascripts/es6_browserified/itineraries/actions/index.js
index 7d225f2f6..7d225f2f6 100644
--- a/app/assets/javascripts/es6_browserified/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/actions/index.js
diff --git a/app/assets/javascripts/es6_browserified/components/App.js b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
index 7488b0b39..7488b0b39 100644
--- a/app/assets/javascripts/es6_browserified/components/App.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
index ec0d130d2..ec0d130d2 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/BSelect2.js
diff --git a/app/assets/javascripts/es6_browserified/components/Todo.js b/app/assets/javascripts/es6_browserified/itineraries/components/Todo.js
index 6d8a6988f..6d8a6988f 100644
--- a/app/assets/javascripts/es6_browserified/components/Todo.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/Todo.js
diff --git a/app/assets/javascripts/es6_browserified/components/TodoList.js b/app/assets/javascripts/es6_browserified/itineraries/components/TodoList.js
index 3ea2c90e1..3ea2c90e1 100644
--- a/app/assets/javascripts/es6_browserified/components/TodoList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/TodoList.js
diff --git a/app/assets/javascripts/es6_browserified/containers/AddTodo.js b/app/assets/javascripts/es6_browserified/itineraries/containers/AddTodo.js
index d0128f16d..d0128f16d 100644
--- a/app/assets/javascripts/es6_browserified/containers/AddTodo.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/AddTodo.js
diff --git a/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleTodoList.js
index 464d6e482..464d6e482 100644
--- a/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleTodoList.js
diff --git a/app/assets/javascripts/es6_browserified/form_helper.js b/app/assets/javascripts/es6_browserified/itineraries/form_helper.js
index d48718841..d48718841 100644
--- a/app/assets/javascripts/es6_browserified/form_helper.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/form_helper.js
diff --git a/app/assets/javascripts/es6_browserified/reducers/index.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
index 381b32d8b..381b32d8b 100644
--- a/app/assets/javascripts/es6_browserified/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
diff --git a/app/assets/javascripts/es6_browserified/reducers/todos.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/todos.js
index 916cd4704..916cd4704 100644
--- a/app/assets/javascripts/es6_browserified/reducers/todos.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/todos.js
diff --git a/app/assets/javascripts/es6_browserified/stop_points.js b/app/assets/javascripts/es6_browserified/itineraries/stop_points.js
index f594c0da4..f594c0da4 100644
--- a/app/assets/javascripts/es6_browserified/stop_points.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/stop_points.js
diff --git a/app/views/routes/_form.html.slim b/app/views/routes/_form.html.slim
index 9893e4ed7..ae07d41de 100644
--- a/app/views/routes/_form.html.slim
+++ b/app/views/routes/_form.html.slim
@@ -29,4 +29,4 @@
| window.itinerary_stop = "#{URI.escape(route_json_for_edit(@route))}"
/ StopPoints Reactux component
-= javascript_include_tag 'es6_browserified/stop_points.js'
+= javascript_include_tag 'es6_browserified/itineraries/stop_points.js'
diff --git a/spec/javascripts/actions_spec.js b/spec/javascripts/actions_spec.js
index 55de1c31f..f86466375 100644
--- a/spec/javascripts/actions_spec.js
+++ b/spec/javascripts/actions_spec.js
@@ -1,4 +1,4 @@
-var actions = require('es6_browserified/actions')
+var actions = require('es6_browserified/itineraries/actions')
describe('actions', () => {
it('should create an action to add a stop', () => {
diff --git a/spec/javascripts/components_spec.js b/spec/javascripts/components_spec.js
index fc99a3335..c7e541783 100644
--- a/spec/javascripts/components_spec.js
+++ b/spec/javascripts/components_spec.js
@@ -1,8 +1,8 @@
var React = require('react');
var Provider = require('react-redux').Provider;
-var actions = require('es6_browserified/actions/index');
-var App = require('es6_browserified/components/TodoList');
-var ConnectedApp = require('es6_browserified/containers/VisibleTodoList');
+var actions = require('es6_browserified/itineraries/actions/index');
+var App = require('es6_browserified/itineraries/components/TodoList');
+var ConnectedApp = require('es6_browserified/itineraries/containers/VisibleTodoList');
var TestUtils = require('react-addons-test-utils');
xdescribe('ConnectedApp', function() {
diff --git a/spec/javascripts/reducers_spec.js b/spec/javascripts/reducers_spec.js
index 985bdc220..253229dda 100644
--- a/spec/javascripts/reducers_spec.js
+++ b/spec/javascripts/reducers_spec.js
@@ -1,4 +1,4 @@
-var reducer = require('es6_browserified/reducers/todos')
+var reducer = require('es6_browserified/itineraries/reducers/todos')
let state = []
describe('stops reducer', () => {
beforeEach(()=>{