diff --git a/Frontend/src/components/screens/Dashboard/DashboardScreen.jsx b/Frontend/src/components/screens/Dashboard/DashboardScreen.jsx
index 9240edcf..acb90545 100644
--- a/Frontend/src/components/screens/Dashboard/DashboardScreen.jsx
+++ b/Frontend/src/components/screens/Dashboard/DashboardScreen.jsx
@@ -1,6 +1,6 @@
import React, {useState} from 'react';
import ScreensTemplate from '../../ScreensTemplate';
-import {Grid} from '@mui/material';
+import {Grid, Box} from '@mui/material';
import PropTypes from 'prop-types';
import AllocationGraph from './AllocationGraph';
import PortfolioOverview from './PortfolioOverview';
@@ -20,27 +20,27 @@ const DashboardScreen = props => {
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx b/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx
index cd796818..3ff7ae9f 100644
--- a/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx
+++ b/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx
@@ -1,21 +1,20 @@
import React from 'react';
-import {Grid, Card, CardHeader, CardContent} from '@mui/material';
+import {Card, Container, CardContent, Box} from '@mui/material';
import PortfolioPerformance from './PortfolioPerformance';
import PortfolioValueChart from './PortfolioValuechart';
export const PortfolioCharts = props => {
return (
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
)
diff --git a/Frontend/src/components/screens/Dashboard/PortfolioOverview.jsx b/Frontend/src/components/screens/Dashboard/PortfolioOverview.jsx
index ec8cac78..167a81bf 100644
--- a/Frontend/src/components/screens/Dashboard/PortfolioOverview.jsx
+++ b/Frontend/src/components/screens/Dashboard/PortfolioOverview.jsx
@@ -23,13 +23,9 @@ const PortfolioOverview = props => {
return (
-
+
{
-
- Gains
- {
+
+ Gains
+ {
new Intl.NumberFormat('de-DE', {style: 'currency', currency: 'EUR',}).format(portfolio['gains'])
}
-
- Realized Gains
- {portfolio['realisedGains']}
+
+ Realised Gains
+ {portfolio['realisedGains']}
-
- Dividends
- 0,00€
+
+ Dividends
+ 0,00€
@@ -92,7 +86,7 @@ const PortfolioOverview = props => {
}
PortfolioOverview.propTypes = {
- activePortfolio: PropTypes.string,
+ activePortfolio: PropTypes.any,
setActivePortfolio: PropTypes.func,
portfolioData: PropTypes.object,
};
diff --git a/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx b/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx
index 344ac17c..60f8b43a 100644
--- a/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx
+++ b/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx
@@ -125,12 +125,17 @@ export const PortfolioPerformance = props => {
}
changeData(props.view, perfData, labels, options, setup)
return (
-
-
- {
+
+
+ {
setRealised(!realised)
- }}/>} label='Realised Performance'/>
+ }}/>}
+ label='Realised Performance'
+ />
}/>
diff --git a/Frontend/src/components/screens/Dashboard/PortfolioValuechart.jsx b/Frontend/src/components/screens/Dashboard/PortfolioValuechart.jsx
index f8800257..dcde19d4 100644
--- a/Frontend/src/components/screens/Dashboard/PortfolioValuechart.jsx
+++ b/Frontend/src/components/screens/Dashboard/PortfolioValuechart.jsx
@@ -137,7 +137,7 @@ export const PortfolioValueChart = props => {
changeData(props.view, valueData, labels, options, setup, 0)
changeData(props.view, investedData, labels, options, setup, 1)
return (
-
+
diff --git a/Frontend/src/components/screens/Home.jsx b/Frontend/src/components/screens/Home.jsx
index e9229366..81627835 100644
--- a/Frontend/src/components/screens/Home.jsx
+++ b/Frontend/src/components/screens/Home.jsx
@@ -17,21 +17,35 @@ const Home = () => {
'/',
`${process.env.PUBLIC_URL}/assets/images/dashboard.jpeg`,
'Dashboard',
- 'Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging across all continents except Antarctica'
+ 'Your data from your activities are visualized here, so at a glance you get all the important info about your portfolio!'
],
'watchlists': [
'rgb(59 151 210)',
'/watchlists',
`${process.env.PUBLIC_URL}/assets/images/watchlist.png`,
'Watchlists',
- 'Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging across all continents except Antarctica'
+ 'Save your favorite shares and crypto to always have an overview of the course. This way you can decide in a flash if it is time to buy or sell!'
],
'activities': [
- 'rgb(228 126 37)',
+ 'rgb(241 155 31)',
'/activities',
`${process.env.PUBLIC_URL}/assets/images/activities.png`,
'Activities',
- 'Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging across all continents except Antarctica'
+ 'Add new purchases, sales, and dividend distributions to your activities to get an overview of previous activities!'
+ ],
+ 'analysis': [
+ 'rgb(228 126 37)',
+ '/analysis',
+ `${process.env.PUBLIC_URL}/assets/images/activities.png`,
+ 'Analysis',
+ 'If you want to get a deeper insight into your portfolio, you are at the right place. You can have your assets broken down by different criteria to get a feeling about the distribution of your portfolio!'
+ ],
+ 'benchi': [
+ 'rgb(239, 195, 25)',
+ '/benchi',
+ `${process.env.PUBLIC_URL}/assets/images/activities.png`,
+ 'Benchi',
+ 'Do you want to take a new direction or are you still unsure what the perfect investment strategy for you looks like? Let our analysis bot Benchi advice you free of charge and find out what suits you best!'
]
}
diff --git a/Frontend/src/components/screens/Settings/SettingsScreen.jsx b/Frontend/src/components/screens/Settings/SettingsScreen.jsx
index 09cb9996..eccd424d 100644
--- a/Frontend/src/components/screens/Settings/SettingsScreen.jsx
+++ b/Frontend/src/components/screens/Settings/SettingsScreen.jsx
@@ -69,8 +69,7 @@ const SettingsScreen = props => {
}}
>
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
+ Upload your previously saved data in the form of a Json file to get back to your current state. This way you have complete control over your data!
{
}
}}
>
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
+ Download your data here to back it up or use it on another device. Keep the file safe, we have no way to restore your data!
{
}
}}
>
- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
- et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
+ Delete your data to get an empty portfolio. Your watchlist will be reset as well. Be careful that we can't restore your data, so download it first if you still need it!