diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index 1d8036db..4e943416 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -1,9 +1,8 @@
import React from 'react';
-import {Switch, Route} from 'react-router-dom';
+import {Switch, Route, withRouter} from 'react-router-dom';
import Header from './components/Header.jsx';
import Sidebar from './components/Sidebar.jsx';
import Footer from './components/Footer.jsx';
-import HiddenSidebar from './components/HiddenSidebar.jsx';
import Socket from '../socket.js';
import Index from "./components/Index";
import UsersContent from "./components/UsersContent";
@@ -38,14 +37,6 @@ class App extends React.Component {
componentDidMount() {
this.checkLogin();
- // Wait 1 second before redirecting to login page
- setTimeout(() => {
- if (!this.state.loggedIn) {
- browserHistory.push("/login");
- }
- }, 1000);
- this.connectWebSocket();
- this.getFactorioVersion(); //Init serverStatus, so i know, which factorio-version is installed
}
connectWebSocket() {
@@ -63,6 +54,7 @@ class App extends React.Component {
checkLogin() {
$.ajax({
url: "/api/user/status",
+ type: "GET",
dataType: "json",
success: (data) => {
if (data.success === true) {
@@ -70,7 +62,15 @@ class App extends React.Component {
loggedIn: true,
username: data.data.Username
});
+
+ this.connectWebSocket();
+ this.getFactorioVersion(); //Init serverStatus, so i know, which factorio-version is installed
+ } else {
+ this.props.history.push("/login");
}
+ },
+ error: () => {
+ this.props.history.push("/login");
}
})
}
@@ -128,6 +128,7 @@ class App extends React.Component {
url: "/api/server/facVersion",
// dataType: "json",
success: (data) => {
+ console.log(data);
this.setState({
factorioVersion: data.data.base_mod_version
});
@@ -184,13 +185,6 @@ class App extends React.Component {
-
-
} else {
resp = ;
@@ -200,4 +194,4 @@ class App extends React.Component {
}
}
-export default App
+export default withRouter(App);
diff --git a/ui/App/components/HiddenSidebar.jsx b/ui/App/components/HiddenSidebar.jsx
deleted file mode 100644
index aa62947b..00000000
--- a/ui/App/components/HiddenSidebar.jsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import React from 'react';
-import {NavLink} from 'react-router-dom';
-import PropTypes from 'prop-types';
-import FontAwesomeIcon from "./FontAwesomeIcon";
-
-class HiddenSidebar extends React.Component {
- constructor(props) {
- super(props);
- }
-
- capitalizeFirstLetter(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
- }
-
- render() {
- var username;
- if (this.props.loggedIn) {
- username = {this.props.username}
- }
-
- return (
-
- )
- }
-}
-
-HiddenSidebar.propTypes = {
- serverStatus: PropTypes.object.isRequired,
- username: PropTypes.string.isRequired,
- loggedIn: PropTypes.bool.isRequired,
- checkLogin: PropTypes.func.isRequired,
-}
-
-
-export default HiddenSidebar
diff --git a/ui/App/components/LoginContent.jsx b/ui/App/components/LoginContent.jsx
index e7cf4c30..946dd370 100644
--- a/ui/App/components/LoginContent.jsx
+++ b/ui/App/components/LoginContent.jsx
@@ -7,9 +7,7 @@ class LoginContent extends React.Component {
this.loginUser = this.loginUser.bind(this);
}
- componentDidMount() {
- console.log(this.props);
- }
+ componentDidMount() {}
loginUser(e) {
e.preventDefault();