refactor into ducks

Createdd · Jun 19, 2017 · 4e7b107 · 4e7b107
1 parent 5c7e7dd
commit 4e7b107
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git a/index.js b/index.js
@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import { createStore } from 'redux';
 
 import Scoreboard from './src/containers/Scoreboard';
-import QuestionReducer from './src/reducers/question';
+import QuestionReducer from './src/ducks/question';
 
 const store = createStore(
 	QuestionReducer,

diff --git a/src/actions/question.js b/src/actions/question.js
diff --git a/src/actiontypes/question.js b/src/actiontypes/question.js
diff --git a/src/containers/Scoreboard.js b/src/containers/Scoreboard.js
@@ -6,7 +6,7 @@ import AddQuestionForm from '../components/AddQuestionForm';
 import Header from '../components/Header';
 import Question from '../components/Question';
 import QuestionDetail from '../components/QuestionDetail';
-import * as QuestionActionCreators from '../actions/question';
+import * as QuestionActionCreators from '../ducks/question';
 
 class Scoreboard extends React.Component {
 	static PropTypes = {

diff --git a/src/reducers/question.js → src/ducks/question.js b/src/reducers/question.js → src/ducks/question.js
@@ -1,5 +1,10 @@
-import * as QuestionActionTypes from '../actiontypes/question';
+// Actions
+const ADD_QUESTION = 'question/ADD_QUESTION';
+const REMOVE_QUESTION = 'question/REMOVE_QUESTION';
+const UPDATE_QUESTION_SCORE = 'question/UPDATE_QUESTION_SCORE';
+const SELECT_QUESTION = 'question/SELECT_QUESTION';
 
+// Reducers
 const initialState = {
   questions: [
     {
@@ -27,7 +32,7 @@ const initialState = {
 export default function Question(state = initialState, action) {
   const date = `${new Date().getHours()}:00`;
   switch (action.type) {
-    case QuestionActionTypes.ADD_QUESTION:
+    case ADD_QUESTION:
       const addQuestionList = [
         ...state.questions,
         {
@@ -40,7 +45,7 @@ export default function Question(state = initialState, action) {
         ...state,
         questions: addQuestionList,
       };
-    case QuestionActionTypes.REMOVE_QUESTION:
+    case REMOVE_QUESTION:
       const removeQuestionList = [
         ...state.questions.slice(0, action.index),
         ...state.questions.slice(action.index + 1),
@@ -49,8 +54,7 @@ export default function Question(state = initialState, action) {
         ...state,
         questions: removeQuestionList,
       };
-
-    case QuestionActionTypes.UPDATE_QUESTION_SCORE:
+    case UPDATE_QUESTION_SCORE:
       const updateQuestionList = state.questions.map((question, index) => {
         if (index === action.index) {
           return {
@@ -65,13 +69,31 @@ export default function Question(state = initialState, action) {
         ...state,
         questions: updateQuestionList,
       };
-    case QuestionActionTypes.SELECT_QUESTION:
+    case SELECT_QUESTION:
       return {
         ...state,
         selectedQuestionIndex: action.index,
       };
-
     default:
       return state;
   }
 }
+
+// ActionCreators
+export const addQuestion = name => ({
+  type: ADD_QUESTION,
+  name,
+});
+export const removeQuestion = index => ({
+  type: REMOVE_QUESTION,
+  index,
+});
+export const updateQuestionScore = (index, score) => ({
+  type: UPDATE_QUESTION_SCORE,
+  index,
+  score,
+});
+export const selectQuestion = index => ({
+  type: SELECT_QUESTION,
+  index,
+});