Merge branch 'develop'

Author: mroote

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
- - 1.7.6
- - 1.8.5
- - 1.9.2
+ - "1.10"
+ - "1.11"
+ - "1.12"
  - tip
 
 install:

docker/Dockerfile

@@ -4,7 +4,7 @@ FROM frolvlad/alpine-glibc
 MAINTAINER Mitch Roote <mitch@r00t.ca>
 
 ENV FACTORIO_VERSION=latest \
-    MANAGER_VERSION=0.8.0 \
+    MANAGER_VERSION=0.8.1 \
     ADMIN_PASSWORD=factorio
 
 VOLUME /opt/factorio/saves /opt/factorio/mods /opt/factorio/config /security

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,14 +54,23 @@ class App extends React.Component {
     checkLogin() {
         $.ajax({
             url: "/api/user/status",
+            type: "GET",
             dataType: "json",
             success: (data) => {
                 if (data.success === true) {
                     this.setState({
                         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
                 });
@@ -180,17 +181,10 @@ class App extends React.Component {
                         <Route path="/saves" render={(props) => {return <SavesContent {...props} {...appProps}/>}}/>
                         <Route path="/config" render={(props) => {return <ConfigContent {...props} {...appProps}/>}}/>
                         <Route path="/console" render={(props) => {return <ConsoleContent {...props} {...appProps}/>}}/>
-                        <Route exakt path="/" render={(props) => {return <Index {...props} {...appProps} />}}/>
+                        <Route exact path="/" render={(props) => {return <Index {...props} {...appProps} />}}/>
                     </Switch>
 
                     <Footer />
-
-                    <HiddenSidebar
-                        serverStatus={this.state.serverStatus}
-                        username={this.state.username}
-                        loggedIn={this.state.loggedIn}
-                        checkLogin={this.checkLogin}
-                    />
                 </div>
         } else {
             resp = <div><p>Not Logged in</p></div>;
@@ -200,4 +194,4 @@ class App extends React.Component {
     }
 }
 
-export default App
+export default withRouter(App);

ui/App/components/HiddenSidebar.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();

ui/App/components/LoginContent.jsx

@@ -26,10 +26,9 @@ $('body').on("show.bs.collapse hide.bs.collapse", (e) => {
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {Route} from 'react-router';
 import App from './App/App.jsx';
 import LoginContent from './App/components/LoginContent.jsx';
-import {BrowserRouter, Switch} from "react-router-dom";
+import {BrowserRouter, Switch, Route} from "react-router-dom";
 
 /**
  * Start React Render