From 11b6d13653406a855834609914b9edce3888fb47 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Thu, 22 Apr 2021 12:07:54 +0200
Subject: [PATCH] logo positioning, page routing corrections

---
 src/app.js                                 |  4 ++--
 src/branding/slew/slew-values.js           |  1 -
 src/branding/villasweb/villasweb-values.js |  1 -
 src/common/menu.js                         |  8 +++++---
 src/styles/app.css                         | 13 +++++++++++++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/app.js b/src/app.js
index af3460a..45498b2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -122,9 +122,9 @@ class App extends React.Component {
               { pages.scenarios ? <Route path="/scenarios/:scenario" component={Scenario} /> : '' }
               { pages.scenarios ? <Route path="/dashboards/:dashboard" component={Dashboard} /> : '' }
               { pages.infrastructure ? <Route exact path="/infrastructure" component={InfrastructureComponents} /> : '' }
-              { pages.infrastructure ? <Route path="/infrastructure/:ic" component={InfrastructureComponent} /> : '' }
+              <Route path="/infrastructure/:ic" component={InfrastructureComponent} />
               { pages.account ? <Route path="/account" component={User} /> : '' }
-              { pages.users ? <Route path="/users" component={Users} /> : '' }
+              <Route path="/users" component={Users} />
               { pages.api ? <Route path="/api" component={APIBrowser} /> : '' }
             </div>
           </div>
diff --git a/src/branding/slew/slew-values.js b/src/branding/slew/slew-values.js
index 5fc7c56..a62ccf9 100644
--- a/src/branding/slew/slew-values.js
+++ b/src/branding/slew/slew-values.js
@@ -24,7 +24,6 @@ const slew_values = {
       home: true,
       scenarios: true,
       infrastructure: false,
-      users: false,
       account: false,
       api: false
    },
diff --git a/src/branding/villasweb/villasweb-values.js b/src/branding/villasweb/villasweb-values.js
index c055a32..2b0fdf5 100644
--- a/src/branding/villasweb/villasweb-values.js
+++ b/src/branding/villasweb/villasweb-values.js
@@ -23,7 +23,6 @@ const villasweb_values = {
       home: true,
       scenarios: true,
       infrastructure: true,
-      users: true,
       account: true,
       api: true,
    },
diff --git a/src/common/menu.js b/src/common/menu.js
index 1c1ac6f..4dad81b 100644
--- a/src/common/menu.js
+++ b/src/common/menu.js
@@ -70,13 +70,13 @@ class SidebarMenu extends React.Component {
         links.push(<li key={key}><a href={values.links[key]} title={key}>{key}</a></li>);
       })
     }
-    var logoStyle = { height: 110, margin: 'auto' };
+    var logoStyle = { width: 110, margin: 'auto' };
     var logo = branding.getLogo(logoStyle);
 
     return (
       <div className="menucontainer">
         { logo ?
-          <div className="menu">
+          <div className="menulogo">
             {logo}
           </div>
           : ''
@@ -88,7 +88,9 @@ class SidebarMenu extends React.Component {
             <ul>
               <li hidden={!values.pages.home}><NavLink to="/home" activeClassName="active" title="Home">Home</NavLink></li>
               <li hidden={!values.pages.scenarios}><NavLink to="/scenarios" activeClassName="active" title="Scenarios">Scenarios</NavLink></li>
-              <li hidden={!values.pages.infrastructure}><NavLink to="/infrastructure" activeClassName="active" title="Infrastructure">Infrastructure</NavLink></li>
+              {this.props.currentRole === 'Admin' || values.pages.infrastructure ?
+                <li><NavLink to="/infrastructure" activeClassName="active" title="Infrastructure">Infrastructure</NavLink></li> : ''
+              }
               {this.props.currentRole === 'Admin' ?
                 <li><NavLink to="/users" activeClassName="active" title="Users">Users</NavLink></li> : ''
               }
diff --git a/src/styles/app.css b/src/styles/app.css
index 0523a78..29cb9b9 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -128,6 +128,19 @@ body {
               0 9px 18px 0 rgba(0, 0, 0, 0.1);
 }
 
+.menulogo {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  text-align: center;
+  margin-bottom: 20px;
+  width: 160px;
+  border-radius: var(--borderradius);
+
+  background-color: #fff;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
+              0 9px 18px 0 rgba(0, 0, 0, 0.1);
+}
+
 .menu a {
   color: var(--secondarytext);
   text-decoration:none;