add image of datamodel, add descriptive text for terminology

README.md

@@ -6,7 +6,7 @@ This is VILLASweb, the website displaying and processing simulation data in the
 
 The frontend connects to __two__ backends: _VILLASweb-backend_ and _VILLASnode_.
 
-VILLASnode provides actual simulation data via websockets. VILLASweb-backend provides any other data like user acounts, simulation configuration etc.
+VILLASnode provides actual simulation data via websockets. VILLASweb-backend provides any other data like user accounts, infrastructure components and configurations, dashboards etc.
 
 For more information on the backends see their repositories.
 
@@ -18,6 +18,10 @@ React is responsible for rendering the UI and Flux for handling the data and com
 
 Additional libraries are used, for a complete list see package.json.
 
+## Data model
+
+![Datamodel](src/img/datamodel.png)
+
 ## Quick start
 
 We recommend Docker to get started quickly: 
@@ -33,7 +37,7 @@ The default user and password are configured in the `config.js` file of the _bac
 
 ## Copyright
 
-2017, Institute for Automation of Complex Power Systems, EONERC  
+2020, Institute for Automation of Complex Power Systems, EONERC  
 
 ## License
 
@@ -66,6 +70,7 @@ For other licensing options please consult [Prof. Antonello Monti](mailto:amonti
 [![EONERC ACS Logo](doc/pictures/eonerc_logo.png)](http://www.acs.eonerc.rwth-aachen.de)
 
  - Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+ - Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
 
 [Institute for Automation of Complex Power Systems (ACS)](http://www.acs.eonerc.rwth-aachen.de)  
 [EON Energy Research Center (EONERC)](http://www.eonerc.rwth-aachen.de)  

src/common/home.js

@@ -63,24 +63,39 @@ class Home extends React.Component {
             A total of <Link to="/users" title="Users">{this.getCounts('users')} users</Link> are registered.<br />
           </p>
         */}
-        <h3>Terminology of VILLASweb</h3>
-        <ul>
-          <li>Infrastructure Component: A component of research infrastructure
-            <ul>
-              <li>Category: for example simulator, gateway, amplifier, database, etc.</li>
-              <li>Type: for example RTDS, OpalRT, VILLASnode, Cassandra</li>
-            </ul>
-          </li>
-          <li>Component Configuration
-            <ul>
-              <li>Input signals: Signals that can be modified in VILLASweb</li>
-              <li>Output signals: Signals that can be visualized on dashboards of VILLASweb</li>
-              <li>Parameters: Further configuration parameters of the infrastructure component</li>
-            </ul>
-          </li>
-          <li>Dashboards: Can be used to visualize ongoing experiments as well as to interact with them in real-time</li>
-          <li>Scenario: A collection of component configurations and dashboards for a specific experiment</li>
-        </ul>
+
+        <h3>Data Model</h3>
+        <img height={400} src={require('../img/datamodel.png')} alt="Datamodel VILLASweb" />
+
+        <h3>Terminology </h3>
+
+        <h5>Infrastructure Component</h5>
+          <ul>
+            <li>A component of research infrastructure</li>
+            <li>Category: for example simulator, gateway, amplifier, database, etc.</li>
+            <li>Type: for example RTDS, OpalRT, VILLASnode, Cassandra</li>
+          </ul>
+
+        <h5>Component Configuration</h5>
+          <ul>
+            <li>Input signals: Signals that can be modified in VILLASweb</li>
+            <li>Output signals: Signals that can be visualized on dashboards of VILLASweb</li>
+            <li>Parameters: Further configuration parameters of the infrastructure component</li>
+          </ul>
+
+        <h5>Dashboard</h5>
+          <ul>
+            <li>Visualize ongoing experiments in real-time</li>
+            <li>Interact with ongoing experiments in real-time</li>
+          </ul>
+
+        <h5>Scenario</h5>
+          <ul>
+            <li>A collection of component configurations and dashboards for a specific experiment</li>
+            <li>Users can have access to multiple scenarios</li>
+          </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>