Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into Logeshwari_Fix_Role_“i”_icons_top_of_Permissions_Management

Author: Logeshwari-Renu

package-lock.json

@@ -62,6 +62,7 @@
     "reactjs-popup": "^2.0.5",
     "reactstrap": "^8.4.1",
     "read-excel-file": "^5.5.3",
+    "recharts": "^2.12.7",
     "redux": "^4.0.5",
     "redux-actions": "^2.6.5",
     "redux-concatenate-reducers": "^1.0.0",

package.json

@@ -109,6 +109,10 @@ body {
   background-color: #3A506B !important;
 }
 
+.bg-yinmn-blue-light{
+  background-color:#2f4157;
+}
+
 .bg-azure{
   background-color: #007BFF !important;
 }
@@ -130,7 +134,11 @@ body {
 }
 
 .text-dark-green{
-  background-color: #193D31 !important;
+  color: #193D31 !important;
+}
+
+.text-custom-grey{
+  color: rgb(192, 192, 192) !important;
 }
 
 .box-shadow-dark {

src/App.css

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { ENDPOINTS } from "utils/URL";
-import GET_EQUIPMENT_BY_ID,{SET_EQUIPMENTS}from 'constants/bmdashboard/equipmentConstants';
+import GET_EQUIPMENT_BY_ID, {SET_EQUIPMENTS} from 'constants/bmdashboard/equipmentConstants';
 import { GET_ERRORS } from 'constants/errors';
 
 export const fetchEquipmentById = (equipmentId) => {
@@ -16,7 +16,7 @@ export const fetchEquipmentById = (equipmentId) => {
   }
 }
 
-export const fetchAllEQUIPMENTS = () => {
+export const fetchAllEquipments = () => {
   return async dispatch => {
     axios.get(ENDPOINTS.BM_EQUIPMENTS)
       .then(res => {
@@ -47,7 +47,7 @@ export const addEquipmentType = async (body) => {
 
 export const setEquipment = payload => {
   return {
-    type: GET_EQUIPMENT_BY_ID,
+    type: SET_EQUIPMENTS,
     payload
   }
 }

src/actions/bmdashboard/equipmentActions.js

@@ -1,6 +1,16 @@
 import axios from 'axios';
 import { ENDPOINTS } from "utils/URL";
-import GET_MATERIAL_TYPES, { POST_BUILDING_MATERIAL_INVENTORY_TYPE, POST_ERROR_BUILDING_MATERIAL_INVENTORY_TYPE, RESET_POST_BUILDING_MATERIAL_INVENTORY_TYPE, GET_INV_BY_TYPE, GET_TOOL_TYPES ,GET_CONSUMABLE_TYPES, GET_EQUIPMENT_TYPES, GET_REUSABLE_TYPES } from "constants/bmdashboard/inventoryTypeConstants";
+import GET_MATERIAL_TYPES, { POST_BUILDING_MATERIAL_INVENTORY_TYPE, 
+                             POST_ERROR_BUILDING_MATERIAL_INVENTORY_TYPE, 
+                             RESET_POST_BUILDING_MATERIAL_INVENTORY_TYPE, 
+                             POST_BUILDING_CONSUMABLE_INVENTORY_TYPE, 
+                             POST_ERROR_BUILDING_CONSUMABLE_INVENTORY_TYPE, 
+                             RESET_POST_BUILDING_CONSUMABLE_INVENTORY_TYPE,
+                             POST_BUILDING_TOOL_INVENTORY_TYPE, 
+                             POST_ERROR_BUILDING_TOOL_INVENTORY_TYPE, 
+                             RESET_POST_BUILDING_TOOL_INVENTORY_TYPE,
+                             GET_INV_BY_TYPE, GET_TOOL_TYPES ,
+                             GET_CONSUMABLE_TYPES  } from "constants/bmdashboard/inventoryTypeConstants";
 import { POST_TOOLS_LOG, POST_ERROR_TOOLS_LOG, RESET_POST_TOOLS_LOG } from 'constants/bmdashboard/toolsConstants';
 import { GET_ERRORS } from "constants/errors";
 
@@ -86,6 +96,23 @@ export const postBuildingConsumableType = payload => {
   };
 };
 
+export const postBuildingToolType = payload => {
+  return async dispatch => {
+    axios
+      .post(ENDPOINTS.BM_TOOLS, payload)
+      .then(res => {
+        dispatch(setPostBuildingToolTypeResult(res.data));
+      })
+      .catch(err => {
+        dispatch(
+          setPostErrorBuildingToolTypeResult(
+            JSON.stringify(err.response.data) || 'Sorry! Some error occurred!',
+          ),
+        );
+      });
+  };
+};
+
 export const postBuildingInventoryType = (payload) => {
   return async dispatch => {
     axios.post(ENDPOINTS.BM_MATERIAL_TYPE, payload)
@@ -113,6 +140,13 @@ export const setPostBuildingConsumableTypeResult = payload => {
   };
 };
 
+export const setPostBuildingToolTypeResult = payload => {
+  return {
+    type: POST_BUILDING_TOOL_INVENTORY_TYPE,
+    payload,
+  };
+};
+
 
 export const setPostErrorBuildingInventoryTypeResult = (payload) => {
   return {
@@ -148,6 +182,13 @@ export const setPostErrorBuildingConsumableTypeResult = payload => {
   };
 };
 
+export const setPostErrorBuildingToolTypeResult = payload => {
+  return {
+    type: POST_ERROR_BUILDING_TOOL_INVENTORY_TYPE,
+    payload,
+  };
+};
+
 export const resetPostBuildingInventoryTypeResult = () => {
   return {
     type: RESET_POST_BUILDING_MATERIAL_INVENTORY_TYPE
@@ -160,6 +201,11 @@ export const resetPostBuildingConsumableTypeResult = () => {
   };
 };
 
+export const resetPostBuildingToolTypeResult = () => {
+  return {
+    type: RESET_POST_BUILDING_TOOL_INVENTORY_TYPE,
+  };
+};
 
 
 export const setMaterialTypes = payload => {