Merge Sveta

src/reducers/index.js

@@ -12,7 +12,6 @@ import topicId from './admin/test/createTopics';
 import topic from './admin/test/getTopic';
 import deleteTopic from './admin/test/deleteTopic';
 import deleteQuestion from './admin/test/deleteQuestion';
-import  initialValues from './admin/initialValues';
 import arrayAnswers from './admin/test/getAnswers'
 import changeUser from './admin/test/changeUser';
 import deleteUsers from './admin/test/deleteUsers';
@@ -38,7 +37,7 @@ export default combineReducers({
     chageLoginReducer,
     changeEmailReducer,
     form,
-
+    category,
     changeCategory,
     newCategory,
     topicId,
@@ -48,7 +47,6 @@ export default combineReducers({
     arrayQuestions,
     deleteTopic,
     deleteQuestion,
-    initialValues, 
     arrayAnswers,
     changeUser,
     deleteUsers, 

src/reducers/initialState.js

@@ -15,6 +15,12 @@ export default {
         data: null,
         error: null
     },
+    deleteTopic:{
+        isFetching:true,
+    },
+    deleteQuestion:{
+        isFetching:false,
+    },
 
     signIn: {
         isFetching: false,
@@ -26,6 +32,29 @@ export default {
         data: null,
         error: null
     },
+    category: {
+        data: null,
+        isFetching: false,
+        error: null,
+        isFlag: false
+    },
+    topicId: {
+        isFetching: false,
+        error: null
+    },
+    topic: {
+        // topic:null,
+        isFetching: true,
+        error: null
+    }
+    ,
+ 
+    newCategory: {
+        data: null,
+        isFetching: false,
+        error: null,
+        isFlag: false
+    },
     logOut: {
         isFetching: false,
         isSuccessful: null,