Merge pull request #188 from open-source-labs/cleanCode

Clean code

Author: Fredwards

.gitignore

@@ -6,7 +6,7 @@ build
 release-builds
 coverage
 __tests__/**/__snapshots__
-# .env
+.env
 users.json
 test_users.json
 

__tests__/test_settings.json

@@ -1 +1 @@
-{"setupRequired":false,"services":[["myPostgres","SQL","postgres://zwezmnqm:[email protected]:5432/zwezmnqm","Online bookstore with that keeps track of orders and customers","Jun 28, 2020 4:58 PM"],["ToddDB","MongoDB","mongodb+srv://tdwolf6:[email protected]/Chronos?retryWrites=true&w=majority","Web app deployed on AWS","Jul 3, 2020 7:12AM"],["orders","MongoDB","mongodb+srv://yangsong:[email protected]/orders?retryWrites=true&w=majority","orders","May 31, 2022 5:16 PM"]],"mode":"light mode","splash":true,"landingPage":"dashBoard"}
+{"setupRequired":false,"services":[["myPostgres","SQL","postgres://zwezmnqm:[email protected]:5432/zwezmnqm","Online bookstore with that keeps track of orders and customers","Jun 28, 2020 4:58 PM"],["ToddDB","MongoDB","mongodb+srv://tdwolf6:[email protected]/Chronos?retryWrites=true&w=majority","Web app deployed on AWS","Jul 3, 2020 7:12AM"],["orders","MongoDB","mongodb+srv://yangsong:[email protected]/orders?retryWrites=true&w=majority","orders","May 31, 2022 5:16 PM"],["JamesMongo","MongoDB","mongodb+srv://james:[email protected]/test?retryWrites=true&w=majority","","Jun 15, 2022 10:34 AM"],["JamesPostgres","SQL","postgres://dxdebork:[email protected]/dxdebork","","Jun 15, 2022 11:11 AM"]],"mode":"light mode","splash":true,"landingPage":"dashBoard"}

app/charts/EventChart.tsx

@@ -1,6 +1,5 @@
-import { time } from 'd3';
 import moment from 'moment';
-import React, { useContext, useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import Plot from 'react-plotly.js';
 import { all, solo as soloStyle } from './sizeSwitch';
 
@@ -20,11 +19,6 @@ interface SoloStyles {
 
 const EventChart: React.FC<EventChartProps> = React.memo(props => {
   const { metric, timeList, valueList, sizing, colourGenerator } = props;
-// console.log('in event chart:');
-// console.log('event chart metric:', metric);
- // console.log('event chart timelist',JSON.stringify(timeList))
-//  console.log('event chart valuelist', JSON.stringify(valueList));
-
   const [solo, setSolo] = useState<SoloStyles | null>(null);
 
   setInterval(() => {

app/charts/HealthChart.tsx

@@ -1,8 +1,5 @@
 import moment from 'moment';
-import React, { useEffect, useState } from 'react';
-
-import { useParams } from 'react-router-dom';
-
+import React, { useState } from 'react';
 import Plot from 'react-plotly.js';
 import { all, solo as soloStyle } from './sizeSwitch';
 
@@ -22,28 +19,15 @@ interface SoloStyles {
 }
 
 const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
-  const { service } = useParams<any>();
   const { renderService, metric, timeList, valueList, sizing, colourGenerator } = props;
   const [solo, setSolo] = useState<SoloStyles | null>(null);
-  //console.log('in the HealthChart');
-  //console.log('healthchart valuelist:', JSON.stringify(valueList));
-  //console.log('healthchart timelist:', JSON.stringify(timeList));
-
   setInterval(() => {
     if (solo !== soloStyle) {
       setSolo(soloStyle);
     }
   }, 20);
 
   const createChart = () => {
-   
-    // if (service && renderService && service !== renderService ) {
-    //   console.log("current service is:", service, "render service is:", renderService);
-    //   return (<div><p>Loading...</p></div>)
-
-    // }
-    // else{
-      
       const timeArr = timeList.map((el: any) => moment(el).format('kk:mm:ss'));
       const hashedColour = colourGenerator(renderService);
       let plotlyData: {
@@ -101,10 +85,7 @@ const HealthChart: React.FC<HealthChartProps> = React.memo(props => {
             },
           }}
         />
-      );
-
-    // }
-     
+      ); 
   };
 
   return (