seperate upload and report screens

client/src/store/actions/doorLockActions.js

@@ -1,17 +1,17 @@
 import {
-    FETCH_DOOR_LOCK_CHARGES_PENDING,
-    FETCH_DOOR_LOCK_CHARGES_SUCCESS,
-    FETCH_DOOR_LOCK_CHARGES_FAILED
+    UPLOAD_DOOR_LOCK_DATA_PENDING,
+    UPLOAD_DOOR_LOCK_DATA_SUCCESS,
+    UPLOAD_DOOR_LOCK_DATA_FAILED
 } from "../constants";
 
-export const fetchDoorLockCharges = (dispatch) => {
-    dispatch({type: FETCH_DOOR_LOCK_CHARGES_PENDING});
-    fetch('/api/doorLockCharges')
+export const uploadDoorLockData = (dispatch) => {
+    dispatch({type: UPLOAD_DOOR_LOCK_DATA_PENDING});
+    fetch('/api/doorLockData')
         .then(response => response.json())
         .then(data => {
-            dispatch({type: FETCH_DOOR_LOCK_CHARGES_SUCCESS, payload: data})
+            dispatch({type: UPLOAD_DOOR_LOCK_DATA_SUCCESS, payload: data})
         })
         .catch(err => {
-            dispatch({type: FETCH_DOOR_LOCK_CHARGES_FAILED, payload: err})
+            dispatch({type: UPLOAD_DOOR_LOCK_DATA_FAILED, payload: err})
         })
 };

client/src/store/constants.js

@@ -1,3 +1,3 @@
-export const FETCH_DOOR_LOCK_CHARGES_PENDING = 'FETCH_DOOR_LOCK_CHARGES_PENDING';
-export const FETCH_DOOR_LOCK_CHARGES_SUCCESS = 'FETCH_DOOR_LOCK_CHARGES_SUCCESS';
-export const FETCH_DOOR_LOCK_CHARGES_FAILED = 'FETCH_DOOR_LOCK_CHARGES_FAILED';
+export const UPLOAD_DOOR_LOCK_DATA_PENDING = 'UPLOAD_DOOR_LOCK_DATA_PENDING';
+export const UPLOAD_DOOR_LOCK_DATA_SUCCESS = 'UPLOAD_DOOR_LOCK_DATA_SUCCESS';
+export const UPLOAD_DOOR_LOCK_DATA_FAILED = 'UPLOAD_DOOR_LOCK_DATA_FAILED';

client/src/store/reducers/doorLockReducers.js

@@ -1,30 +1,30 @@
 import {
-    FETCH_DOOR_LOCK_CHARGES_PENDING,
-    FETCH_DOOR_LOCK_CHARGES_SUCCESS,
-    FETCH_DOOR_LOCK_CHARGES_FAILED
+    UPLOAD_DOOR_LOCK_DATA_PENDING,
+    UPLOAD_DOOR_LOCK_DATA_SUCCESS,
+    UPLOAD_DOOR_LOCK_DATA_FAILED
 } from "../constants";
 
 const initialState = {
-    incidents: [],
     pending: false,
+    result: {},
     error: '',
 };
 
-export const doorLockCharges = (state, action) => {
+export const doorLockData = (state, action) => {
   state = state || initialState;
   action = action || {};
 
   switch(action.type){
-      case FETCH_DOOR_LOCK_CHARGES_PENDING:
+      case UPLOAD_DOOR_LOCK_DATA_PENDING:
           return Object.assign({}, state, {
               pending: true,
           });
-      case FETCH_DOOR_LOCK_CHARGES_SUCCESS:
+      case UPLOAD_DOOR_LOCK_DATA_SUCCESS:
           return Object.assign({}, state, {
-              incidents: action.payload,
               pending: false,
+              result: action.payload,
           });
-      case FETCH_DOOR_LOCK_CHARGES_FAILED:
+      case UPLOAD_DOOR_LOCK_DATA_FAILED:
           return Object.assign({}, state, {
               pending: false,
               error: action.payload,

client/src/store/reducers/index.js

@@ -1,8 +1,8 @@
 import { combineReducers } from "redux";
 
-import { doorLockCharges} from "./doorLockReducers";
+import { doorLockData} from "./doorLockReducers";
 
 export const rootReducer = combineReducers({
-    doorLockCharges
+    doorLockData
 });