merging minor changes

Merge branch 'Tim/aws-graph' of https://github.com/oslabs-beta/Chronos into ChronosTeam/ecs-final

Author: timlee12

.gitignore

@@ -8,6 +8,7 @@ coverage
 __tests__/**/__snapshots__
 .env
 databases.txt
+settings.json
 
 # Compiled source #
 ###################

app/App.tsx

@@ -2,19 +2,14 @@ import React, { useState } from 'react';
 import Splash from './components/Splash';
 import DashboardContainer from './containers/DashboardContainer';
 import './stylesheets/scrollBar.scss';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { ReactQueryDevtools } from 'react-query/devtools'
-
-const queryClient = new QueryClient();
 
 const App: React.FC = React.memo(() => {
   return (
-    <QueryClientProvider client={queryClient}>
+    <div>
       <Splash />
       <DashboardContainer />
-    </QueryClientProvider>
-
-  )
+    </div>
+  );
 });
 
 export default App;

app/containers/AWSGraphsContainer.tsx

@@ -46,7 +46,6 @@ const AwsGraphsContainer: React.FC = React.memo(props => {
   useEffect(() => {
     return () => {
       console.log('unmounting, shut down fetch process');
-
       if(intervalID) clearInterval(intervalID);
       setAwsData({ CPUUtilization: [], NetworkIn: [], NetworkOut: [], DiskReadBytes: [] })
       setAwsEcsData({});

app/modals/AwsModal.tsx

@@ -76,10 +76,10 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
             <option value="AWS/ECS">Elastic Container Service (ECS)</option>
           </select>
         </div>
-        {typeOfService === 'AWS/EC2' &&
+        {typeOfService === 'AWS/EC2' && (
           <div>
             <label htmlFor="instance">
-              Instance ID<span>*</span>
+              AWS Instance ID<span>*</span>
             </label>
             <input
               id="aws-instance"
@@ -90,7 +90,7 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
               required
             />
           </div>
-        }
+        )}
         <div>
           <label htmlFor="region">
             Region<span>*</span>
@@ -128,7 +128,7 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
           </label>
           <input
             id="aws-access-key"
-            type="text"
+            type="password"
             name="accessKey"
             value={accessKey}
             onChange={e => handleChange(e)}
@@ -142,7 +142,7 @@ const AwsModal: React.FC<AddModalProps> = React.memo(({ setOpen }) => {
           </label>
           <input
             id="aws-secret-access-key"
-            type="text"
+            type="password"
             name="secretAccessKey"
             value={secretAccessKey}
             onChange={e => handleChange(e)}