Admin is mostly working

admin/src/App/App.js

@@ -0,0 +1,15 @@
+import React, { Component }  from "react"
+import NavigationContainer from "./NavigationContainer"
+
+class App extends Component {
+	render() {
+		return(
+			<div>
+				<NavigationContainer />
+				{this.props.children}
+			</div>
+		)
+	}
+}
+
+export default App

admin/src/App/Navigation.js

@@ -0,0 +1,55 @@
+import React, { Component } from "react";
+import { Link } from "react-router-dom";
+import { Menu, Dropdown } from "semantic-ui-react";
+
+const navStyle = {
+  marginBottom: "30px"
+};
+const blankStyle = {
+  marginBottom: "50px"
+};
+
+class Navigation extends Component {
+  constructor(props) {
+    super(props);
+    this._logout = this._logout.bind(this);
+  }
+
+  _logout = event => {
+    event.preventDefault();
+    this.props.manualLogout();
+  };
+
+  render() {
+    var profileLink = process.env.REACT_APP_ACCOUNT_SERVER + "/profile";
+    return (
+      <div>
+        {this.props.user.authenticated ? (
+          <Menu style={navStyle}>
+            <Menu.Item name="systems" header>
+              { process.env.REACT_APP_SITE_NAME}
+            </Menu.Item>
+            <Menu.Menu position="right">
+              <Link to="/list-systems">
+                <Menu.Item name="systems"> Systems</Menu.Item>
+              </Link>
+              <Link to="/about">
+                <Menu.Item name="about">About</Menu.Item>
+              </Link>
+              <Dropdown item text={this.props.user.email}>
+                <Dropdown.Menu>
+                  <Dropdown.Item href={profileLink}>Profile</Dropdown.Item>
+                  <Dropdown.Item onClick={this._logout}>Logout</Dropdown.Item>
+                </Dropdown.Menu>
+              </Dropdown>
+            </Menu.Menu>
+          </Menu>
+        ) : (
+            <div style={blankStyle} />
+          )}
+      </div>
+    );
+  }
+}
+
+export default Navigation;

admin/src/App/NavigationContainer.js

@@ -0,0 +1,21 @@
+import { connect } from "react-redux"
+import * as userActions from "../User/user-actions"
+import Navigation from "./Navigation"
+
+
+// Function passed in to `connect` to subscribe to Redux store updates.
+// Any time it updates, mapStateToProps is called.
+const mapStateToProps = (state) => {
+	return {
+		user: state.user
+	}
+
+}
+
+// Connects React component to the redux store
+// It does not modify the component class passed to it
+// Instead, it returns a new, connected component class, for you to use.
+export default connect(
+	mapStateToProps,
+	userActions
+)(Navigation)

admin/src/App/Restricted.js

@@ -0,0 +1,56 @@
+// in src/restricted.js
+import React, { Component } from 'react';
+import { withRouter } from 'react-router-dom';
+import * as types from "../User/user-constants";
+import axios from "axios";
+/**
+ * Higher-order component (HOC) to wrap restricted pages
+ */
+const restricted = (BaseComponent, store) => {
+    class Restricted extends Component {
+        componentWillMount() {
+            this.checkAuthentication(this.props);
+        }
+
+        componentWillReceiveProps(nextProps) {
+            if (nextProps.location !== this.props.location) {
+                this.checkAuthentication(nextProps);
+            }
+        }
+
+        checkAuthentication(params) {
+            const { history } = params;
+            const authenticated = store.getState().user.authenticated;
+            if (!authenticated) {
+              axios
+                .get(process.env.REACT_APP_ACCOUNT_SERVER + "/authenticated", {withCredentials: true})
+                .then(response => {
+                  if (response.data.success) {
+                    const user = response.data.user
+                    store.dispatch({
+                      type: types.LOGIN_SUCCESS_USER,
+                      data: user
+                    });
+                  } else {
+                    window.location = process.env.REACT_APP_ACCOUNT_SERVER + "/login?nextLocation=admin";
+                    /*history.replace({ pathname: '/login',
+            				state: { nextPathname: params.location.pathname } });*/
+                  }
+                })
+                .catch(response => {
+                  if (response instanceof Error) {
+                    window.location = process.env.REACT_APP_ACCOUNT_SERVER + "/login?nextLocation=admin";
+                    // Something happened during logout that triggered an Error
+                    console.log("Error", response.message);
+                  }
+                });
+
+            }
+        }
+        render() {
+            return <BaseComponent {...this.props} />;
+        }
+    }
+    return withRouter(Restricted);
+}
+export default restricted