Merge branch 'dev' into sofia

Author: sarhiri

app/components/AwsECSClusterGraphs.tsx

@@ -25,7 +25,7 @@ const AwsECSClusterGraphs: React.FC = React.memo(props => {
         colour += `00${value.toString(16)}`.substring(-2);
       }
 
-      console.log(colour);
+      // console.log(colour);
       return colour;
     }
   };

app/containers/AWSGraphsContainer.tsx

@@ -92,7 +92,7 @@ const AwsGraphsContainer: React.FC = React.memo(props => {
     }
   };
 
-  console.log(awsUrl)
+  // console.log(awsUrl)
 
   return (
     <div className="AWS-container">

app/containers/MainContainer.tsx

@@ -2,7 +2,7 @@ import React, { useContext,useState } from 'react';
 import { Route, Routes } from 'react-router-dom';
 import About from '../components/About/About';
 import Contact from '../components/Contact/Contact';
-import Settings from '@material-ui/icons/Settings';
+import Settings from '../components/Setting/Setting';
 import Occupied from '../components/Occupied/Occupied';
 import lightAndDark from '../components/Styling';
 import GraphsContainer from './GraphsContainer/GraphsContainer';

app/context/HealthContext.tsx

@@ -55,7 +55,7 @@ const HealthContextProvider: React.FC<Props> = React.memo(({ children }) => {
    */
 
   const fetchHealthData = useCallback(async servers => {
-    console.log({servers})
+    // console.log({servers})
     ipcRenderer.removeAllListeners('healthResponse');
 
     let temp: HealthDataObject[] = [];
@@ -67,7 +67,7 @@ const HealthContextProvider: React.FC<Props> = React.memo(({ children }) => {
               ipcRenderer.send('healthRequest', `${service}`);
               ipcRenderer.on('healthResponse', (event: Electron.Event, data: string) => {
                 let result: object[];
-                console.log({data})
+                // console.log({data})
                 if (JSON.stringify(data) !== '{}' && tryParseJSON(data)) {
                   result = JSON.parse(data);
                   // console.log('HealthContext.tsx line 68 result: ', result, 'service', service, 'Obj key', Object.keys(result[0])[0]);

app/modals/AddModal/AddModal.tsx

@@ -5,7 +5,7 @@ import './AddModal.scss';
 
 import { TModalSetter } from '../../components/Occupied/types/Occupied';
 import ServiceDBType from './ServiceDBType';
-import ServicesDescription from'./ServicesDescription';
+import ServicesDescription from './ServicesDescription';
 
 interface IFields {
   typeOfService: string;