JS gardening for itineraries

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

8 files changed, 46 insertions, 46 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/App.js b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
index 7488b0b39..c02f9b814 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/App.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/App.js
@@ -1,11 +1,11 @@
 var React = require('react')
-var AddTodo = require('../containers/AddTodo')
-var VisibleTodoList = require('../containers/VisibleTodoList')
+var AddStopPoint = require('../containers/AddStopPoint')
+var VisibleStopPoints = require('../containers/VisibleStopPoints')
 
 const App = () => (
   <div>
-    <AddTodo />
-    <VisibleTodoList />
+    <AddStopPoint />
+    <VisibleStopPoints />
   </div>
 )
 
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/Todo.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
index f2932ab1d..30e7387c6 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/Todo.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPoint.js
@@ -2,7 +2,7 @@ var React = require('react')
 var PropTypes = require('react').PropTypes
 var BSelect2 = require('./BSelect2')
 
-const Todo = (props) => {
+const StopPoint = (props) => {
   return (
     <div className='list-group-item'>
       <div className='row'>
@@ -63,7 +63,7 @@ const Todo = (props) => {
   )
 }
 
-Todo.propTypes = {
+StopPoint.propTypes = {
   onDeleteClick: PropTypes.func.isRequired,
   onMoveUpClick: PropTypes.func.isRequired,
   onMoveDownClick: PropTypes.func.isRequired,
@@ -75,4 +75,4 @@ Todo.propTypes = {
   value: PropTypes.object
 }
 
-module.exports = Todo
+module.exports = StopPoint
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/TodoList.js b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
index 3ea2c90e1..6c1afd48d 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/TodoList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/StopPointList.js
@@ -1,12 +1,12 @@
 var React = require('react')
 var PropTypes = require('react').PropTypes
-var Todo = require('./Todo')
+var StopPoint = require('./StopPoint')
 
-const TodoList = ({ todos, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange }) => {
+const StopPointList = ({ stopPoints, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange, onSelectChange }) => {
   return (
     <div className='list-group'>
-      {todos.map((todo, index) =>
-        <Todo
+      {stopPoints.map((stopPoint, index) =>
+        <StopPoint
           key={'item-' + index}
           onDeleteClick={() => onDeleteClick(index)}
           onMoveUpClick={() => {
@@ -16,21 +16,21 @@ const TodoList = ({ todos, onDeleteClick, onMoveUpClick, onMoveDownClick, onChan
           onChange={ onChange }
           onSelectChange={ (e) => onSelectChange(e, index) }
           first={ index === 0 }
-          last={ index === (todos.length - 1) }
+          last={ index === (stopPoints.length - 1) }
           index={ index }
-          value={ todo }
+          value={ stopPoint }
         />
       )}
     </div>
   )
 }
 
-TodoList.propTypes = {
-  todos: PropTypes.array.isRequired,
+StopPointList.propTypes = {
+  stopPoints: PropTypes.array.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
   onMoveUpClick: PropTypes.func.isRequired,
   onMoveDownClick: PropTypes.func.isRequired,
   onSelectChange: PropTypes.func.isRequired
 }
 
-module.exports = TodoList
+module.exports = StopPointList
diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/AddTodo.js b/app/assets/javascripts/es6_browserified/itineraries/containers/AddStopPoint.js
index d0128f16d..6a6489d61 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/containers/AddTodo.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/AddStopPoint.js
@@ -2,7 +2,7 @@ var React = require('react')
 var connect = require('react-redux').connect
 var actions = require('../actions')
 
-let AddTodo = ({ dispatch }) => {
+let AddStopPoint = ({ dispatch }) => {
   return (
     <div className="clearfix" style={{marginBottom: 10}}>
       <form onSubmit={e => {
@@ -17,6 +17,6 @@ let AddTodo = ({ dispatch }) => {
     </div>
   )
 }
-AddTodo = connect()(AddTodo)
+AddStopPoint = connect()(AddStopPoint)
 
-module.exports = AddTodo
+module.exports = AddStopPoint
diff --git a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleTodoList.js b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
index 464d6e482..729d27227 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleTodoList.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/containers/VisibleStopPoints.js
@@ -1,10 +1,10 @@
 var actions = require('../actions')
 var connect = require('react-redux').connect
-var TodoList = require('../components/TodoList')
+var StopPointList = require('../components/StopPointList')
 
 const mapStateToProps = (state) => {
   return {
-    todos: state.todos
+    stopPoints: state.stopPoints
   }
 }
 
@@ -28,9 +28,9 @@ const mapDispatchToProps = (dispatch) => {
   }
 }
 
-const VisibleTodoList = connect(
+const VisibleStopPoints = connect(
   mapStateToProps,
   mapDispatchToProps
-)(TodoList)
+)(StopPointList)
 
-module.exports = VisibleTodoList
+module.exports = VisibleStopPoints
diff --git a/app/assets/javascripts/es6_browserified/itineraries/stop_points.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index d5f53fb4f..16e3bb2c2 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/stop_points.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -2,7 +2,7 @@ var React = require('react')
 var render = require('react-dom').render
 var Provider = require('react-redux').Provider
 var createStore = require('redux').createStore
-var todoApp = require('./reducers')
+var reducers = require('./reducers')
 var App = require('./components/App')
 var addInput = require('./form_helper')
 
@@ -36,10 +36,10 @@ const getInitialState = () => {
   return state
 }
 
-var initialState = {todos: getInitialState()}
+var initialState = {stopPoints: getInitialState()}
 // const loggerMiddleware = createLogger()
 let store = createStore(
-  todoApp,
+  reducers,
   initialState
   // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
@@ -53,14 +53,14 @@ render(
 
 document.querySelector('input[name=commit]').addEventListener('click', (event)=>{
   let state = store.getState()
-  for (let [i, todo] of state.todos.entries()){
-    if (todo.stoppoint_id == undefined){
-      todo.stoppoint_id = ""
+  for (let [i, stopPoint] of state.stopPoints.entries()){
+    if (stopPoint.stoppoint_id == undefined){
+      stopPoint.stoppoint_id = ""
     }
-    addInput('id',todo.stoppoint_id, i)
-    addInput('stop_area_id',todo.stoparea_id, i)
+    addInput('id',stopPoint.stoppoint_id, i)
+    addInput('stop_area_id',stopPoint.stoparea_id, i)
     addInput('position',i, i)
-    addInput('for_boarding',todo.for_boarding, i)
-    addInput('for_alighting',todo.for_alighting, i)
+    addInput('for_boarding',stopPoint.for_boarding, i)
+    addInput('for_alighting',stopPoint.for_alighting, i)
   }
 })
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
index 381b32d8b..446c9ed36 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/index.js
@@ -1,8 +1,8 @@
 var combineReducers = require('redux').combineReducers
-var todos = require('./todos')
+var stopPoints = require('./stopPoints')
 
-const todoApp = combineReducers({
-  todos
+const stopPointsApp = combineReducers({
+  stopPoints
 })
 
-module.exports = todoApp
+module.exports = stopPointsApp
diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/todos.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index 215a3e2c2..010ded766 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/todos.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -1,6 +1,6 @@
 var addInput = require('../form_helper')
 
-const todo = (state = {}, action, length) => {
+const stopPoint = (state = {}, action, length) => {
   switch (action.type) {
     case 'ADD_STOP':
       return {
@@ -21,12 +21,12 @@ const updateFormForDeletion = (stop) =>{
   }
 }
 
-const todos = (state = [], action) => {
+const stopPoints = (state = [], action) => {
   switch (action.type) {
     case 'ADD_STOP':
       return [
         ...state,
-        todo(undefined, action, state.length)
+        stopPoint(undefined, action, state.length)
       ]
     case 'MOVE_STOP_UP':
       return [
@@ -46,9 +46,9 @@ const todos = (state = [], action) => {
       updateFormForDeletion(state[action.index])
       return [
         ...state.slice(0, action.index),
-        ...state.slice(action.index + 1).map((todo)=>{
-          todo.index--
-          return todo
+        ...state.slice(action.index + 1).map((stopPoint)=>{
+          stopPoint.index--
+          return stopPoint
         })
       ]
     case 'UPDATE_INPUT_VALUE':
@@ -65,7 +65,7 @@ const todos = (state = [], action) => {
         }
       })
       // return state.map(t =>
-      //   todo(t, action)
+      //   stopPoint(t, action)
       // )
     case 'UPDATE_SELECT_VALUE':
       return state.map( (t,i) => {
@@ -82,4 +82,4 @@ const todos = (state = [], action) => {
   }
 }
 
-module.exports = todos
+module.exports = stopPoints