From a46c8aa8803eada2b508bda77440796b5de4178f Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Wed, 23 Aug 2017 18:04:16 +0200
Subject: [PATCH 1/4] change menu title from "User Managment" to "Users" in
 order to match the style of other entries (closes #104)

---
 src/components/menu-sidebar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/menu-sidebar.js b/src/components/menu-sidebar.js
index 66ab5fb..51d7d83 100644
--- a/src/components/menu-sidebar.js
+++ b/src/components/menu-sidebar.js
@@ -34,7 +34,7 @@ class SidebarMenu extends React.Component {
           <li><NavLink to="/simulations" activeClassName="active" title="Simulations">Simulations</NavLink></li>
           <li><NavLink to="/simulators" activeClassName="active" title="Simulators">Simulators</NavLink></li>
           { this.props.currentRole === 'admin' ? 
-              <li><NavLink to="/users" activeClassName="active" title="User Management">User Management</NavLink></li> : ''
+              <li><NavLink to="/users" activeClassName="active" title="User Management">Users</NavLink></li> : ''
           }
           <li><NavLink to="/logout" title="Logout">Logout</NavLink></li>
         </ul>

From 07ab29f5da51a199ccce2f65f1d7d9a759bf5b30 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Wed, 23 Aug 2017 18:11:46 +0200
Subject: [PATCH 2/4] more details in footer (closes #121)

---
 src/components/footer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/footer.js b/src/components/footer.js
index 31d29ed..788ddf1 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -25,7 +25,7 @@ class Footer extends Component {
   render() {
     return (
       <footer className="app-footer">
-        Copyright &copy; {new Date().getFullYear()}
+        <a href="http://www.fein-aachen.org/projects/villas-framework/">VILLASweb</a> - Copyright &copy; {new Date().getFullYear()} - <a href="https://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> - <a href="https://www.rwth-aachen.de">RWTH Aachen University</a>
       </footer>
     );
   }

From 1175b789d136cbb08a5bb801c1a480678e390e39 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sat, 16 Sep 2017 19:33:29 +0200
Subject: [PATCH 3/4] improve styling of footer

---
 src/components/footer.js | 2 +-
 src/styles/app.css       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/footer.js b/src/components/footer.js
index 788ddf1..2ebd1c9 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -25,7 +25,7 @@ class Footer extends Component {
   render() {
     return (
       <footer className="app-footer">
-        <a href="http://www.fein-aachen.org/projects/villas-framework/">VILLASweb</a> - Copyright &copy; {new Date().getFullYear()} - <a href="https://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> - <a href="https://www.rwth-aachen.de">RWTH Aachen University</a>
+        Copyright &copy; {new Date().getFullYear()} - <a href="https://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> - <a href="https://www.rwth-aachen.de">RWTH Aachen University</a>
       </footer>
     );
   }
diff --git a/src/styles/app.css b/src/styles/app.css
index 6cc5360..f01e3a6 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -80,6 +80,10 @@ body {
   clear: both;
 }
 
+.app-footer a {
+  color: #333;
+}
+
 .app-body {
   padding: 15px 5px 0px 5px;
 }
@@ -136,7 +140,7 @@ body {
 .menu-sidebar ul {
   padding-top: 10px;
   list-style: none;
-  white-space: nowrap;  
+  white-space: nowrap;
 }
 
 .menu-sidebar a::after {

From e67607ddbdc3e3d5b03bf1e6b3702d94dbdd88b7 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sat, 16 Sep 2017 19:34:03 +0200
Subject: [PATCH 4/4] properly make use of Dockers cache

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9307e76..498938f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,14 @@ FROM node:8.2
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
+# use changes to package.json to force Docker not to use the cache
+# when we change our application's nodejs dependencies:
+ADD package.json /usr/src/app
+RUN npm install
+
 # Install app dependencies
 COPY . /usr/src/app
-RUN npm install && npm run build
+RUN npm run build
 
 VOLUME /usr/src/app/build