From 9733dcbb511e9aa9124b77b16377df38e76d06d1 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Tue, 16 Mar 2021 11:55:30 +0100
Subject: [PATCH] move footer to branding

---
 src/app.js                                    |  3 +-
 src/branding/branding.js                      |  6 +++-
 ...llasweb-home.js => villasweb-functions.js} |  8 +++++
 src/common/footer.js                          | 30 -------------------
 src/user/login.js                             |  3 +-
 5 files changed, 15 insertions(+), 35 deletions(-)
 rename src/branding/villasweb/{villasweb-home.js => villasweb-functions.js} (92%)
 delete mode 100644 src/common/footer.js

diff --git a/src/app.js b/src/app.js
index 1b2b4ce..00abbc1 100644
--- a/src/app.js
+++ b/src/app.js
@@ -26,7 +26,6 @@ import NotificationsDataManager from './common/data-managers/notifications-data-
 
 import Home from './common/home';
 import Header from './common/header';
-import Footer from './common/footer';
 import Menu from './common/menu';
 
 import InfrastructureComponents from './ic/ics';
@@ -106,7 +105,7 @@ class App extends React.Component {
             </div>
           </div>
 
-          <Footer />
+          {branding.getFooter()}
         </div>
     </DndProvider>
   }
diff --git a/src/branding/branding.js b/src/branding/branding.js
index 3ee4000..6ecfb73 100644
--- a/src/branding/branding.js
+++ b/src/branding/branding.js
@@ -15,7 +15,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import { villasweb_home } from './villasweb/villasweb-home';
+import { villasweb_footer, villasweb_home } from './villasweb/villasweb-functions';
 import villasweb_values from './villasweb/villasweb-values';
 
 import { slew_home } from './slew/slew-home';
@@ -82,6 +82,10 @@ class Branding {
         return homepage;
     }
 
+    getFooter() {
+        return villasweb_footer();
+    }
+
     getWelcome() {
         var welcome = '';
         switch (this.brand) {
diff --git a/src/branding/villasweb/villasweb-home.js b/src/branding/villasweb/villasweb-functions.js
similarity index 92%
rename from src/branding/villasweb/villasweb-home.js
rename to src/branding/villasweb/villasweb-functions.js
index ffd3734..65189cf 100644
--- a/src/branding/villasweb/villasweb-home.js
+++ b/src/branding/villasweb/villasweb-functions.js
@@ -65,4 +65,12 @@ export function villasweb_home(title, username, userid, role) {
         <p><a href="http://www.jara.org/en/research/energy">JARA-ENERGY:</a> Jülich-Aachen Research Alliance (JARA) is an initiative of RWTH Aachen University and Forschungszentrum Jülich.</p>
       </ul>
     </div>)
+}
+
+export function villasweb_footer() {
+  return (
+    <footer className="app-footer">
+      Copyright &copy; {new Date().getFullYear()} - <a href="https://www.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>
+  );
 }
\ No newline at end of file
diff --git a/src/common/footer.js b/src/common/footer.js
deleted file mode 100644
index 534a18a..0000000
--- a/src/common/footer.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React, { Component } from 'react';
-
-class Footer extends Component {
-  render() {
-    return (
-      <footer className="app-footer">
-        Copyright &copy; {new Date().getFullYear()} - <a href="https://www.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>
-    );
-  }
-}
-
-export default Footer;
diff --git a/src/user/login.js b/src/user/login.js
index b8cd52d..6b28b19 100644
--- a/src/user/login.js
+++ b/src/user/login.js
@@ -23,7 +23,6 @@ import { Redirect } from 'react-router-dom';
 
 import LoginForm from './login-form';
 import Header from '../common/header';
-import Footer from '../common/footer';
 import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
 import LoginStore from './login-store'
 import AppDispatcher from '../common/app-dispatcher';
@@ -88,7 +87,7 @@ class Login extends Component {
           </div>
         </div>
 
-        <Footer />
+        {branding.getFooter()}
       </div>
     );
   }