From 51c02c1d1d079d894e906ba7562f473874b5e3e4 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Wed, 17 Feb 2021 11:10:16 +0100
Subject: [PATCH] revise home page, add more funding info

---
 src/common/home.js | 51 +++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/common/home.js b/src/common/home.js
index 0fc874d..5932022 100644
--- a/src/common/home.js
+++ b/src/common/home.js
@@ -43,17 +43,15 @@ class Home extends React.Component {
         <img style={{height: 120, float: 'right'}} src={require('../img/villas_web.svg').default} alt="Logo VILLASweb" />
         <h1>Home</h1>
         <p>
-          Welcome to <b>{config.instance}</b> hosted by  <a href={"mailto:" + config.admin.mail}>{config.admin.name}</a>!<br />
+          {/*Welcome to <b>{config.instance}</b>  hosted by  <a href={"mailto:" + config.admin.mail}>{config.admin.name}</a>!<br />*/}
+          Welcome to <b>{config.instance}</b>!
         </p>
         <p>
         You are logged in as user <b>{currentUser.username}</b> with <b>ID {currentUser.id}</b> and role <b>{currentUser.role}</b>.
         </p>
 
-        <p>
-          An interactive documentation of the VILLASweb API is available <NavLink to="/api">here</NavLink>.
-        </p>
 
-        <h3>Data Model</h3>
+        {/*<h3>Data Model</h3>
         <img height={400} src={require('../img/datamodel.png').default} alt="Datamodel VILLASweb" />
 
         <h3>Terminology </h3>
@@ -82,32 +80,47 @@ class Home extends React.Component {
           <ul>
             <li>A collection of component configurations and dashboards for a specific experiment</li>
             <li>Users can have access to multiple scenarios</li>
-          </ul>
+          </ul>*/}
 
         <h3>Credits</h3>
-        <p>VILLASweb is developed by the <a href="http://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> at the <a href="https;//www.rwth-aachen.de">RWTH Aachen University</a>.</p>
+        <p>VILLASweb is an open source project developed by the <a href="http://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> at <a href="https;//www.rwth-aachen.de">RWTH Aachen University</a>.</p>
+        <img height={60} src={require('../img/eonerc_rwth.svg').default} alt="Logo ACS" />
         <ul>
           <li><a href="mailto:stvogel@eonerc.rwth-aachen.de">Steffen Vogel</a></li>
           <li><a href="mailto:sonja.happ@eonerc.rwth-aachen.de">Sonja Happ</a></li>
         </ul>
         <h3>Links</h3>
         <ul>
-          <li><a href="http://fein-aachen.org/projects/villas-framework/">Project Page</a></li>
-          <li><a href="https://villas.fein-aachen.org/doc/web.html">Documentation</a></li>
-          <li><a href="https://git.rwth-aachen.de/acs/public/villas/web">Source Code</a></li>
+          <li><NavLink to="/api">VILLASweb API browser</NavLink></li>
+          <li><a href="http://fein-aachen.org/projects/villas-framework/">FEIN Aachen e.V. project page of VILLASframework</a></li>
+          <li><a href="https://villas.fein-aachen.org/doc/web.html">Documentation of VILLASweb</a></li>
+          <li><a href="https://git.rwth-aachen.de/acs/public/villas/web">Source Code of VILLASweb frontend</a></li>
+          <li><a href="https://git.rwth-aachen.de/acs/public/villas/web-backend-go">Source Code of VILLASweb backend</a></li>
         </ul>
         <h3>Funding</h3>
-        <p>The development of <a href="http://fein-aachen.org/projects/villas-framework/">VILLASframework</a> projects have received funding from</p>
+        <p>The development of <a href="http://fein-aachen.org/projects/villas-framework/">VILLASframework</a> projects has received funding from</p>
         <ul>
-          <li><a href="http://www.acs.eonerc.rwth-aachen.de/cms/E-ON-ERC-ACS/Forschung/Forschungsprojekte/Gruppe-Real-Time-Simulation-and-Hardware/~qxvw/Urban-Energy-Lab-4/">Urban Energy Lab 4.0</a> a project funded by OP EFRE NRW (European Regional Development Fund) for the setup of a novel energy research infrastructure.</li>
-          <li><a href="http://www.re-serve.eu">RESERVE</a> a European Union’s Horizon 2020 research and innovation programme under grant agreement No 727481</li>
-          <li><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.</li>
+          <p>SLEW: Second Life for Energiewende, an Exploratory Teaching Space project funded by RWTH Aachen University</p>
+          <p><a href="https://erigrid2.eu/"> ERIgrid 2.0: </a> An EU Horizon 2020 research and innovation action project for connecting European Smart Grid Infrastructures (grant agreement No 870620)</p>
+          <p>
+            <img height={100} src={require('../img/european_commission.svg').default} alt="Logo EU" />
+            <img height={70} src={require('../img/erigrid2.png').default} alt="Logo ERIgrid 2.0" />
+          </p>
+          <p><a href="http://www.uel4-0.de/">Urban Energy Lab 4.0:</a> A project funded by EFRE.NRW (European Regional Development Fund) for the setup of a novel energy research infrastructure.</p>
+          <p>
+            <img height={70} src={require('../img/uel_efre.jpeg').default} alt="Logo UEL OP EFRE NRW" />
+            <img height={70} src={require('../img/uel.png').default} alt="Logo UEL" />
+          </p>
+          <p><a href="http://www.re-serve.eu">RESERVE:</a> An EU Horizon 2020 research and innovation project (grant agreement No 727481)</p>
+          <p>
+            <img height={100} src={require('../img/european_commission.svg').default} alt="Logo EU" />
+            <img height={70} src={require('../img/reserve.svg').default} alt="Logo RESERVE" />
+          </p>
+          <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>
-        <img height={100} src={require('../img/european_commission.svg').default} alt="Logo EU" />
-        <img height={70} src={require('../img/reserve.svg').default} alt="Logo EU" />
-        <img height={70} src={require('../img/uel_efre.jpeg').default} alt="Logo UEL OP EFRE NRW" />
-        <img height={70} src={require('../img/uel.png').default} alt="Logo UEL" />
-        <img height={60} src={require('../img/eonerc_rwth.svg').default} alt="Logo ACS" />
+
+
+
         {
           //<img height={70} src={require('../img/jara.svg').default} alt="Logo JARA" />
         }