conflicts fixed and merge

1 files changed, 29 insertions, 2 deletions

diff --git a/frontend/src/views/App.js b/frontend/src/views/App.js
index 6c101fa..ebead2f 100644
--- a/frontend/src/views/App.js
+++ b/frontend/src/views/App.js
@@ -6,6 +6,8 @@ import {BrowserRouter as Router, Route, Switch} from "react-router-dom";
 import Services from "./Services";
 import Filters from "./Filters";
 import Rules from "./Rules";
+import Config from "./Config";
+import Upload from "./Upload";
 
 class App extends Component {
 
@@ -14,8 +16,22 @@ class App extends Component {
         this.state = {
             servicesWindowOpen: false,
             filterWindowOpen: false,
-            rulesWindowOpen: false
+            rulesWindowOpen: false,
+            configWindowOpen: false,
+            uploadWindowOpen: false,
+            configDone: false
         };
+
+		fetch('/api/services')
+		.then(response => {
+			if( response.status === 503){
+				this.setState({configWindowOpen: true});
+			} else if (response.status === 200){
+				this.setState({configDone: true});
+			}
+		});
+
+
     }
 
     render() {
@@ -29,13 +45,24 @@ class App extends Component {
         if (this.state.rulesWindowOpen) {
             modal = <Rules onHide={() => this.setState({rulesWindowOpen: false})}/>;
         }
+        if (this.state.configWindowOpen) {
+            modal = <Config onHide={() => this.setState({configWindowOpen: false})}
+						onDone={() => this.setState({configDone: true})}/>;
+        }
+        if (this.state.uploadWindowOpen) {
+            modal = <Upload onHide={() => this.setState({uploadWindowOpen: false}) }/>;
+        }
 
         return (
             <div className="app">
                 <Router>
                     <Header onOpenServices={() => this.setState({servicesWindowOpen: true})}
                             onOpenFilters={() => this.setState({filterWindowOpen: true})}
-                            onOpenRules={() => this.setState({rulesWindowOpen: true})} />
+                            onOpenRules={() => this.setState({rulesWindowOpen: true})} 
+                            onOpenConfig={() => this.setState({configWindowOpen: true})} 
+                            onOpenUpload={() => this.setState({uploadWindowOpen: true})} 
+							onConfigDone={this.state.configDone}
+					/>
                     <Switch>
                         <Route path="/connections/:id" children={<MainPane/>}/>
                         <Route path="/" children={<MainPane/>}/>