From ed846ed4c27f6e34de75a7a422dddbf809aed81b Mon Sep 17 00:00:00 2001 From: irismarie Date: Wed, 3 Mar 2021 17:27:30 +0100 Subject: [PATCH] move all contents to brand homepage --- src/branding/branding.js | 2 +- src/branding/brands.js | 6 --- src/branding/slew/img/slew-logo.png | Bin 0 -> 3939 bytes src/branding/slew/slew_home.js | 16 ++++++- src/branding/villasweb/villasweb-home.js | 52 ++++++++++++----------- src/common/home.js | 7 +-- src/config.js | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 src/branding/slew/img/slew-logo.png 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 0000000000000000000000000000000000000000..747bf8339dac5f79adc1e39d6a5c451e7481c3df GIT binary patch literal 3939 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 +
+ 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