Skip to content

Commit ccfb1ba

Browse files
committed
pre-pull dev
1 parent dae52ca commit ccfb1ba

13 files changed

Lines changed: 4 additions & 600 deletions

File tree

app/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState } from 'react';
2-
import Splash from './components/Splash';
2+
import Splash from './components/Splash/Splash';
33
import DashboardContainer from './containers/DashboardContainer';
44
import './stylesheets/scrollBar.scss';
55

app/components/Contact.tsx

Lines changed: 0 additions & 75 deletions
This file was deleted.

app/components/Header.tsx

Lines changed: 0 additions & 120 deletions
This file was deleted.

app/components/Settings.tsx

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/components/Splash.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/components/WindowBar.tsx

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/containers/GraphsContainer/GraphsContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { HealthContext } from '../../context/HealthContext';
66
import { CommsContext } from '../../context/CommsContext';
77
import { DockerContext } from '../../context/DockerContext';
88
import { EventContext } from '../../context/EventContext';
9-
import Header from '../../components/Header';
9+
import Header from '../../components/Header/Header';
1010
import RequestTypesChart from '../../charts/RequestTypesChart';
1111
import ResponseCodesChart from '../../charts/ResponseCodesChart';
1212
import TrafficChart from '../../charts/TrafficChart';

app/containers/MainContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useContext,useState } from 'react';
22
import { Route, Routes } from 'react-router-dom';
33
import About from '../components/About/About';
44
import Contact from '../components/Contact/Contact';
5-
import Settings from '../components/Settings';
5+
import Settings from '@material-ui/icons/Settings';
66
import Occupied from '../components/Occupied/Occupied';
77
import lightAndDark from '../components/Styling';
88
import GraphsContainer from './GraphsContainer/GraphsContainer';

app/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import ReactDOM from 'react-dom';
77
import './stylesheets/index.scss';
88
import { createTheme, ThemeProvider } from '@material-ui/core/';
99
import App from './App';
10-
import WindowBar from './components/WindowBar';
10+
import WindowBar from './components/WindowBar/WindowBar';
1111

1212
const theme = createTheme({
1313
typography: {

0 commit comments

Comments
 (0)