From 76445901cb5aa71e9847605cf9f499026d356c4e Mon Sep 17 00:00:00 2001
From: Thomas Haddad
Date: Mon, 14 Nov 2016 17:23:29 +0100
Subject: Use es6 imports instead of old requires for more readability

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
---
 .../javascripts/es6_browserified/actions/index.js  | 58 +++++++++++-----------
 .../javascripts/es6_browserified/components/App.js |  8 +--
 .../es6_browserified/components/BSelect2.js        |  7 ++-
 .../es6_browserified/components/Todo.js            |  7 ++-
 .../es6_browserified/components/TodoList.js        |  7 ++-
 .../es6_browserified/containers/AddTodo.js         | 10 ++--
 .../es6_browserified/containers/VisibleTodoList.js | 14 ++----
 .../javascripts/es6_browserified/form_helper.js    | 18 +++----
 .../javascripts/es6_browserified/reducers/index.js |  6 +--
 .../javascripts/es6_browserified/reducers/todos.js |  4 +-
 .../javascripts/es6_browserified/stop_points.js    | 14 +++---
 11 files changed, 72 insertions(+), 81 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/actions/index.js b/app/assets/javascripts/es6_browserified/actions/index.js
index de3bfc113..41d57d28c 100644
--- a/app/assets/javascripts/es6_browserified/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/actions/index.js
@@ -1,32 +1,30 @@
-module.exports = {
-  addStop : () => {
-    return {
-      type: 'ADD_STOP'
-    }
-  },
-  moveStopUp : (index) => {
-    return {
-      type: 'MOVE_STOP_UP',
-      index
-    }
-  },
-  moveStopDown : (index) => {
-    return {
-      type: 'MOVE_STOP_DOWN',
-      index
-    }
-  },
-  deleteStop: (index) => {
-    return {
-      type: 'DELETE_STOP',
-      index
-    }
-  },
-  updateInputValue: (index, text) => {
-    return {
-      type : "UPDATE_INPUT_VALUE",
-      index,
-      text
-    }
+export const addStop = () => {
+  return {
+    type: 'ADD_STOP'
+  }
+}
+export const moveStopUp = (index) => {
+  return {
+    type: 'MOVE_STOP_UP',
+    index
+  }
+}
+export const moveStopDown = (index) => {
+  return {
+    type: 'MOVE_STOP_DOWN',
+    index
+  }
+}
+export const deleteStop = (index) => {
+  return {
+    type: 'DELETE_STOP',
+    index
+  }
+}
+export const updateInputValue = (index, text) => {
+  return {
+    type : "UPDATE_INPUT_VALUE",
+    index,
+    text
   }
 }
diff --git a/app/assets/javascripts/es6_browserified/components/App.js b/app/assets/javascripts/es6_browserified/components/App.js
index 7488b0b39..d41c97217 100644
--- a/app/assets/javascripts/es6_browserified/components/App.js
+++ b/app/assets/javascripts/es6_browserified/components/App.js
@@ -1,6 +1,6 @@
-var React = require('react')
-var AddTodo = require('../containers/AddTodo')
-var VisibleTodoList = require('../containers/VisibleTodoList')
+import React from 'react'
+import AddTodo from '../containers/AddTodo'
+import VisibleTodoList from '../containers/VisibleTodoList'
 
 const App = () => (
   <div>
@@ -9,4 +9,4 @@ const App = () => (
   </div>
 )
 
-module.exports = App
+export default App
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index a78dc625f..6fe0f6307 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -1,6 +1,5 @@
-var React = require('react')
-var PropTypes = require('react').PropTypes
-var Select2 = require('react-select2')
+import React, {PropTypes} from 'react'
+import Select2 from 'react-select2'
 
 
 // get JSON full path
@@ -124,4 +123,4 @@ const formatRepo = (props) => {
   // )
 }
 
-module.exports = BSelect3
+export default BSelect3
diff --git a/app/assets/javascripts/es6_browserified/components/Todo.js b/app/assets/javascripts/es6_browserified/components/Todo.js
index 16e42eb3c..e5effe582 100644
--- a/app/assets/javascripts/es6_browserified/components/Todo.js
+++ b/app/assets/javascripts/es6_browserified/components/Todo.js
@@ -1,6 +1,5 @@
-var React = require('react')
-var PropTypes = require('react').PropTypes
-var BSelect2 = require('./BSelect2')
+import React, {PropTypes} from 'react'
+import BSelect2 from './BSelect2'
 
 const Container = {display: 'table', width: '100%'}
 const firstBlock = {display: 'table-cell', verticalAlign: 'middle'}
@@ -56,4 +55,4 @@ Todo.propTypes = {
   value: PropTypes.object
 }
 
-module.exports = Todo
+export default Todo
diff --git a/app/assets/javascripts/es6_browserified/components/TodoList.js b/app/assets/javascripts/es6_browserified/components/TodoList.js
index e909f07bb..79967e336 100644
--- a/app/assets/javascripts/es6_browserified/components/TodoList.js
+++ b/app/assets/javascripts/es6_browserified/components/TodoList.js
@@ -1,6 +1,5 @@
-var React = require('react')
-var PropTypes = require('react').PropTypes
-var Todo = require('./Todo')
+import React, {PropTypes} from 'react'
+import Todo from './Todo'
 
 const TodoList = ({ todos, onDeleteClick, onMoveUpClick, onMoveDownClick, onChange }) => {
   return (
@@ -31,4 +30,4 @@ TodoList.propTypes = {
   onMoveDownClick: PropTypes.func.isRequired
 }
 
-module.exports = TodoList
+export default TodoList
diff --git a/app/assets/javascripts/es6_browserified/containers/AddTodo.js b/app/assets/javascripts/es6_browserified/containers/AddTodo.js
index 539b6f78e..52a3b55c6 100644
--- a/app/assets/javascripts/es6_browserified/containers/AddTodo.js
+++ b/app/assets/javascripts/es6_browserified/containers/AddTodo.js
@@ -1,13 +1,13 @@
-var React = require('react')
-var connect = require('react-redux').connect
-var addTodo = require('../actions').addStop
+import React from 'react'
+import { connect } from 'react-redux'
+import { addStop } from '../actions'
 
 let AddTodo = ({ dispatch }) => {
   return (
     <div className="clearfix" style={{marginBottom: 10}}>
       <form onSubmit={e => {
         e.preventDefault()
-        dispatch(addTodo())
+        dispatch(addStop())
       }}>
         <button type="submit" className="btn btn-primary btn-xs pull-right">
           <span className="fa fa-plus"></span> Ajouter un arrêt
@@ -18,4 +18,4 @@ let AddTodo = ({ dispatch }) => {
 }
 AddTodo = connect()(AddTodo)
 
-module.exports = AddTodo
+export default AddTodo
diff --git a/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js b/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js
index 09da36060..7fb92bba5 100644
--- a/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js
+++ b/app/assets/javascripts/es6_browserified/containers/VisibleTodoList.js
@@ -1,10 +1,6 @@
-var connect = require('react-redux').connect
-var toggleTodo = require('../actions').toggleTodo
-var deleteStop = require('../actions').deleteStop
-var moveStopUp = require('../actions').moveStopUp
-var moveStopDown = require('../actions').moveStopDown
-var handleChange = require('../actions').updateInputValue
-var TodoList = require('../components/TodoList')
+import {toggleTodo, deleteStop, moveStopUp, moveStopDown, updateInputValue} from '../actions'
+import { connect } from 'react-redux'
+import TodoList from '../components/TodoList'
 
 const mapStateToProps = (state) => {
   return {
@@ -24,7 +20,7 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(moveStopDown(index))
     },
     onChange: (index, text) =>{
-      dispatch(handleChange(index, text))
+      dispatch(updateInputValue(index, text))
     }
   }
 }
@@ -34,4 +30,4 @@ const VisibleTodoList = connect(
   mapDispatchToProps
 )(TodoList)
 
-module.exports = VisibleTodoList
+export default VisibleTodoList
diff --git a/app/assets/javascripts/es6_browserified/form_helper.js b/app/assets/javascripts/es6_browserified/form_helper.js
index 5888f23b9..140794886 100644
--- a/app/assets/javascripts/es6_browserified/form_helper.js
+++ b/app/assets/javascripts/es6_browserified/form_helper.js
@@ -1,10 +1,10 @@
-module.exports = {
-  addInput : (name, value, index) => {
-    let form = document.querySelector('form')
-    let input = document.createElement('input')
-    input.setAttribute('type', 'hidden')
-    input.setAttribute('name', `route[stop_points_attributes][${index}][${name}]`)
-    input.setAttribute('value', value)
-    form.appendChild(input)
-  }
+const addInput = (name, value, index) => {
+  let form = document.querySelector('form')
+  let input = document.createElement('input')
+  input.setAttribute('type', 'hidden')
+  input.setAttribute('name', `route[stop_points_attributes][${index}][${name}]`)
+  input.setAttribute('value', value)
+  form.appendChild(input)
 }
+
+export default addInput
diff --git a/app/assets/javascripts/es6_browserified/reducers/index.js b/app/assets/javascripts/es6_browserified/reducers/index.js
index ae8423673..aee1799aa 100644
--- a/app/assets/javascripts/es6_browserified/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/reducers/index.js
@@ -1,8 +1,8 @@
-var  combineReducers  = require('redux').combineReducers
-var todos = require('./todos')
+import { combineReducers } from 'redux'
+import todos from './todos'
 
 const todoApp = combineReducers({
   todos
 })
 
-module.exports = todoApp
+export default todoApp
diff --git a/app/assets/javascripts/es6_browserified/reducers/todos.js b/app/assets/javascripts/es6_browserified/reducers/todos.js
index e46107efb..00a256978 100644
--- a/app/assets/javascripts/es6_browserified/reducers/todos.js
+++ b/app/assets/javascripts/es6_browserified/reducers/todos.js
@@ -1,4 +1,4 @@
-var addInput = require('../form_helper').addInput
+import addInput from '../form_helper'
 
 const todo = (state = {}, action, length) => {
   switch (action.type) {
@@ -70,4 +70,4 @@ const todos = (state = [], action) => {
   }
 }
 
-module.exports = todos
+export default todos
diff --git a/app/assets/javascripts/es6_browserified/stop_points.js b/app/assets/javascripts/es6_browserified/stop_points.js
index 7ecfd9253..b08f668f8 100644
--- a/app/assets/javascripts/es6_browserified/stop_points.js
+++ b/app/assets/javascripts/es6_browserified/stop_points.js
@@ -1,14 +1,14 @@
-var React = require('react')
-var render = require('react-dom').render
-var Provider = require('react-redux').Provider
-var createStore = require('redux').createStore
+import React from 'react'
+import { render } from 'react-dom'
+import { Provider } from 'react-redux'
+import { createStore } from 'redux'
+import todoApp from './reducers'
+import App from './components/App'
+import addInput from './form_helper'
 // var applyMiddleware = require('redux').applyMiddleware
-var todoApp = require('./reducers')
-var App = require('./components/App')
 // var createLogger = require('redux-logger').default
 // var thunkMiddleware = require('redux-thunk').default
 // var promise = require('redux-promise')
-var addInput = require('./form_helper').addInput
 
 const getInitialState = () => {
   let state = []
-- 
cgit v1.2.3