diff --git a/src/branding/branding.js b/src/branding/branding.js index bbc8a48..94c9a72 100644 --- a/src/branding/branding.js +++ b/src/branding/branding.js @@ -45,7 +45,7 @@ class Branding { homepage = villasweb_home(this.brand.title, username, userid, role); break; case 'slew': - homepage = slew_home(); + homepage = slew_home(this.brand.title); break; default: homepage = villasweb_home(); diff --git a/src/branding/brands.js b/src/branding/brands.js index 45db6c7..de7fac3 100644 --- a/src/branding/brands.js +++ b/src/branding/brands.js @@ -28,12 +28,6 @@ const brands = { account: true, api: true, }, - links: { - "VILLASframework project": "http://fein-aachen.org/projects/villas-framework/", - "VILLASweb Documentation": "https://villas.fein-aachen.org/doc/web.html", - "VILLASweb frontend source": "https://git.rwth-aachen.de/acs/public/villas/web", - "VILLASweb backend source":"https://git.rwth-aachen.de/acs/public/villas/web-backend-go", - } }, slew: { title: 'SLEW', diff --git a/src/branding/slew/img/slew-logo.png b/src/branding/slew/img/slew-logo.png new file mode 100644 index 0000000..747bf83 Binary files /dev/null and b/src/branding/slew/img/slew-logo.png differ diff --git a/src/branding/slew/slew_home.js b/src/branding/slew/slew_home.js index 812b703..c367418 100644 --- a/src/branding/slew/slew_home.js +++ b/src/branding/slew/slew_home.js @@ -17,10 +17,15 @@ import React from 'react'; -export function slew_home() { +export function slew_home(title) { return ( -
+
+ Logo VILLASweb +

Home

+

+ Welcome to {title}! +

SLEW is a learning platform for running experiments in a virtual power engineering world. The platform enables to interact with the experiments in real time and perform analyses on the experimental results.

@@ -35,6 +40,13 @@ export function slew_home() {

The platform is based on the real-time simulation tool DPsim developed in RWTH, which is available as open-source software project to the power engineering community. Besides, it integrates the interactive computing environment Jupyter for further analysis of experimental results.

+ +

Contacts

+
) } diff --git a/src/branding/villasweb/villasweb-home.js b/src/branding/villasweb/villasweb-home.js index 0b119ad..60b6f06 100644 --- a/src/branding/villasweb/villasweb-home.js +++ b/src/branding/villasweb/villasweb-home.js @@ -19,7 +19,9 @@ import { NavLink } from 'react-router-dom'; export function villasweb_home(title, username, userid, role) { return ( -
+
+ Logo VILLASweb +

Home

Welcome to {title}!

@@ -30,37 +32,37 @@ export function villasweb_home(title, username, userid, role) {

VILLASweb is an open source project developed by the Institute for Automation of Complex Power Systems at RWTH Aachen University.

Logo ACS

Links

Funding

The development of VILLASframework projects has received funding from

    -

    SLEW: Second Life for Energiewende, an Exploratory Teaching Space project funded by RWTH Aachen University

    -

    ERIgrid 2.0: An EU Horizon 2020 research and innovation action project for connecting European Smart Grid Infrastructures (grant agreement No 870620)

    -

    - Logo EU - Logo ERIgrid 2.0 -

    -

    Urban Energy Lab 4.0: A project funded by EFRE.NRW (European Regional Development Fund) for the setup of a novel energy research infrastructure.

    -

    - Logo UEL OP EFRE NRW - Logo UEL -

    -

    RESERVE: An EU Horizon 2020 research and innovation project (grant agreement No 727481)

    -

    - Logo EU - Logo RESERVE -

    -

    JARA-ENERGY: Jülich-Aachen Research Alliance (JARA) is an initiative of RWTH Aachen University and Forschungszentrum Jülich.

    +

    SLEW: Second Life for Energiewende, an Exploratory Teaching Space project funded by RWTH Aachen University

    +

    ERIgrid 2.0: An EU Horizon 2020 research and innovation action project for connecting European Smart Grid Infrastructures (grant agreement No 870620)

    +

    + Logo EU + Logo ERIgrid 2.0 +

    +

    Urban Energy Lab 4.0: A project funded by EFRE.NRW (European Regional Development Fund) for the setup of a novel energy research infrastructure.

    +

    + Logo UEL OP EFRE NRW + Logo UEL +

    +

    RESERVE: An EU Horizon 2020 research and innovation project (grant agreement No 727481)

    +

    + Logo EU + Logo RESERVE +

    +

    JARA-ENERGY: Jülich-Aachen Research Alliance (JARA) is an initiative of RWTH Aachen University and Forschungszentrum Jülich.

) } \ No newline at end of file diff --git a/src/common/home.js b/src/common/home.js index e3b2fe4..6045b33 100644 --- a/src/common/home.js +++ b/src/common/home.js @@ -20,8 +20,6 @@ import React from 'react'; import { Redirect } from "react-router-dom"; import Branding from '../branding/branding'; -// Logo is dynamically loaded from img folder, therefore the whole folder is required at this point -const images = require.context('../img', true) class Home extends React.Component { @@ -33,7 +31,6 @@ class Home extends React.Component { } render() { - let currentUser = JSON.parse(localStorage.getItem("currentUser")); if (currentUser == null) { console.log("HOME redirecting to logout/ login") @@ -43,9 +40,7 @@ class Home extends React.Component { const branding = Branding.instance; return ( -
- Logo VILLASweb -

Home

+
{branding.getHome(currentUser.username, currentUser.id, currentUser.role)}
); diff --git a/src/config.js b/src/config.js index e49e4c5..6835213 100644 --- a/src/config.js +++ b/src/config.js @@ -20,7 +20,7 @@ const config = { name: 'Institute for Automation of Complex Power Systems (ACS), RWTH Aachen University, Germany', mail: 'stvogel@eonerc.rwth-aachen.de' }, - branding: 'villasweb', + branding: 'slew', } export default config \ No newline at end of file