From af0dfd361439ec671ee8f4b1d644c84d8502b9c5 Mon Sep 17 00:00:00 2001
From: knoxfighter <philipp@asdff45.de>
Date: Thu, 28 Feb 2019 15:55:36 +0100
Subject: [PATCH 1/2] removed HiddenSidebar

---
 ui/App/App.jsx                      |   8 --
 ui/App/components/HiddenSidebar.jsx | 202 ----------------------------
 2 files changed, 210 deletions(-)
 delete mode 100644 ui/App/components/HiddenSidebar.jsx

diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index 1d8036db..27321ab5 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -3,7 +3,6 @@ import {Switch, Route} 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";
@@ -184,13 +183,6 @@ class App extends React.Component {
                     </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>;
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 = <p>{this.props.username}</p>
-        }
-
-        return (
-            <aside id="control-sidebar" className="control-sidebar control-sidebar-dark">
-                <ul className="nav nav-tabs nav-justified control-sidebar-tabs">
-                    <li className="active">
-                        <a href="control-sidebar-theme-demo-options-tab" data-toggle="tab"><FontAwesomeIcon icon="wrench"/></a>
-                    </li>
-                    <li>
-                        <a href="#control-sidebar-home-tab" data-toggle="tab"><FontAwesomeIcon icon="home"/></a>
-                    </li>
-                    <li>
-                        <a href="#control-sidebar-settings-tab" data-toggle="tab"><FontAwesomeIcon icon="cogs"/></a>
-                    </li>
-                </ul>
-                <div className="tab-content">
-                    <div className="tab-pane" id="control-sidebar-home-tab">
-                        <h3 className="control-sidebar-heading">Recent Activity</h3>
-                        <ul className="control-sidebar-menu">
-                            <li>
-                                <NavLink to="/login" activeClassName="active">
-                                    <FontAwesomeIcon icon="birthday-cake" className="menu-icon bg-red"/>
-
-                                    <div className="menu-info">
-                                        <FontAwesomeIcon icon="lock" className="menu-icon bg-green"/>
-                                        <h4 className="control-sidebar-subheading">Login</h4>
-                                    </div>
-                                </NavLink>
-                            </li>
-                            <li>
-                                <a href="javascript:void(0)">
-                                    <FontAwesomeIcon icon="lock" className="menu-icon bg-yellow"/>
-
-                                    <div className="menu-info">
-                                        <h4 className="control-sidebar-subheading">Logout</h4>
-                                    </div>
-                                </a>
-                            </li>
-                        </ul>
-
-                        <h3 className="control-sidebar-heading">Tasks Progress</h3>
-                        <div className="table-responsive">
-                            <table className="table table-border">
-                                <tbody>
-                                    {Object.keys(this.props.serverStatus).map(function (key) {
-                                        return (
-                                            <tr key={key}>
-                                                <td>{this.capitalizeFirstLetter(key)}</td>
-                                                <td>{this.props.serverStatus[key]}</td>
-                                            </tr>
-                                        )
-                                    }, this)}
-                                </tbody>
-                            </table>
-                        </div>
-                        <ul className="control-sidebar-menu">
-                            <li>
-                                <a href="javascript:void(0)">
-                                    <h4 className="control-sidebar-subheading">
-                                        Custom Template Design
-                                        <span className="label label-danger pull-right">70%</span>
-                                    </h4>
-
-                                    <div className="progress progress-xxs">
-                                        <div className="progress-bar progress-bar-danger"></div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="javascript:void(0)">
-                                    <h4 className="control-sidebar-subheading">
-                                        Update Resume
-                                        <span className="label label-success pull-right">95%</span>
-                                    </h4>
-
-                                    <div className="progress progress-xxs">
-                                        <div className="progress-bar progress-bar-success"></div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="javascript:void(0)">
-                                    <h4 className="control-sidebar-subheading">
-                                        Laravel Integration
-                                        <span className="label label-warning pull-right">50%</span>
-                                    </h4>
-
-                                    <div className="progress progress-xxs">
-                                        <div className="progress-bar progress-bar-warning"></div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="javascript:void(0)">
-                                    <h4 className="control-sidebar-subheading">
-                                        Back End Framework
-                                        <span className="label label-primary pull-right">68%</span>
-                                    </h4>
-
-                                    <div className="progress progress-xxs">
-                                        <div className="progress-bar progress-bar-primary"></div>
-                                    </div>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-
-                    <div className="tab-pane" id="control-sidebar-settings-tab">
-                        <form method="post">
-                            <h3 className="control-sidebar-heading">General Settings</h3>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Report panel usage
-                                    <input type="checkbox" className="pull-right" checked=""/>
-                                </label>
-
-                                <p>
-                                    Some information about this general settings option
-                                </p>
-                            </div>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Allow mail redirect
-                                    <input type="checkbox" className="pull-right" checked=""/>
-                                </label>
-
-                                <p>
-                                    Other sets of options are available
-                                </p>
-                            </div>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Expose author name in posts
-                                    <input type="checkbox" className="pull-right" checked=""/>
-                                </label>
-
-                                <p>
-                                    Allow the user to show his name in blog posts
-                                </p>
-                            </div>
-
-                            <h3 className="control-sidebar-heading">Chat Settings</h3>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Show me as online
-                                    <input type="checkbox" className="pull-right" checked=""/>
-                                </label>
-                            </div>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Turn off notifications
-                                    <input type="checkbox" className="pull-right"/>
-                                </label>
-                            </div>
-
-                            <div className="form-group">
-                                <label className="control-sidebar-subheading">
-                                    Delete chat history
-                                    <a href="javascript:void(0)" className="text-red pull-right"><i
-                                        className="far fa-trash-alt"></i></a>
-                                </label>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </aside>
-        )
-    }
-}
-
-HiddenSidebar.propTypes = {
-    serverStatus: PropTypes.object.isRequired,
-    username: PropTypes.string.isRequired,
-    loggedIn: PropTypes.bool.isRequired,
-    checkLogin: PropTypes.func.isRequired,
-}
-
-
-export default HiddenSidebar

From c22fd4a02456de07d2707df13b127a108243b20c Mon Sep 17 00:00:00 2001
From: knoxfighter <philipp@asdff45.de>
Date: Thu, 28 Feb 2019 17:59:18 +0100
Subject: [PATCH 2/2] fixed redirect when not logged in

---
 ui/App/App.jsx                     | 22 ++++++++++++----------
 ui/App/components/LoginContent.jsx |  4 +---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/App/App.jsx b/ui/App/App.jsx
index 27321ab5..4e943416 100644
--- a/ui/App/App.jsx
+++ b/ui/App/App.jsx
@@ -1,5 +1,5 @@
 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';
@@ -37,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() {
@@ -62,6 +54,7 @@ class App extends React.Component {
     checkLogin() {
         $.ajax({
             url: "/api/user/status",
+            type: "GET",
             dataType: "json",
             success: (data) => {
                 if (data.success === true) {
@@ -69,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");
             }
         })
     }
@@ -127,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
                 });
@@ -192,4 +194,4 @@ class App extends React.Component {
     }
 }
 
-export default App
+export default withRouter(App);
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();