From ccc037a27cc0ecc5e61e8b5086a9877923d7d54e Mon Sep 17 00:00:00 2001 From: juli-and Date: Thu, 12 May 2022 17:07:08 +0200 Subject: [PATCH 1/7] info texts --- Frontend/src/components/screens/Home.jsx | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Frontend/src/components/screens/Home.jsx b/Frontend/src/components/screens/Home.jsx index 5270dd88..27bf258a 100644 --- a/Frontend/src/components/screens/Home.jsx +++ b/Frontend/src/components/screens/Home.jsx @@ -19,21 +19,35 @@ const Home = props => { '/dashboard', `${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)', '/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 payments!' + ], + 'analysis': [ + 'rgb(241 155 31)', + '/activities', + `${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(59 151 210)', + '/activities', + `${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!' ] } From 4896a57bff8c53d9e7c5a526b916c5f378b686ab Mon Sep 17 00:00:00 2001 From: juli-and Date: Thu, 12 May 2022 17:30:45 +0200 Subject: [PATCH 2/7] info text settings --- .../src/components/screens/Settings/SettingsScreen.jsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Frontend/src/components/screens/Settings/SettingsScreen.jsx b/Frontend/src/components/screens/Settings/SettingsScreen.jsx index a0113ad9..2ba00b35 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 Jason 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! Date: Thu, 12 May 2022 17:33:02 +0200 Subject: [PATCH 3/7] refactor: info text home --- Frontend/src/components/screens/Home.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/src/components/screens/Home.jsx b/Frontend/src/components/screens/Home.jsx index 7b78f550..f817976d 100644 --- a/Frontend/src/components/screens/Home.jsx +++ b/Frontend/src/components/screens/Home.jsx @@ -45,7 +45,7 @@ const Home = () => { '/activities', `${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!' + '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!' ] } From 7f2c9d51d8e4e9c93d3820b22a8f7fc26b6d457e Mon Sep 17 00:00:00 2001 From: juli-and Date: Thu, 12 May 2022 17:39:55 +0200 Subject: [PATCH 4/7] refactor: info text about us --- Frontend/src/components/screens/Home.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Frontend/src/components/screens/Home.jsx b/Frontend/src/components/screens/Home.jsx index f817976d..bf57a1b4 100644 --- a/Frontend/src/components/screens/Home.jsx +++ b/Frontend/src/components/screens/Home.jsx @@ -27,22 +27,22 @@ const Home = () => { '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', 'Add new purchases, sales, and dividend distributions to your activities to get an overview of previous payments!' ], 'analysis': [ - 'rgb(241 155 31)', - '/activities', + '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(59 151 210)', - '/activities', + '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!' From c42a502b798e50a9535073cf32ea4e9e1ec65508 Mon Sep 17 00:00:00 2001 From: juli-and Date: Thu, 12 May 2022 18:03:34 +0200 Subject: [PATCH 5/7] refactor: info texts --- Frontend/src/components/screens/Home.jsx | 2 +- Frontend/src/components/screens/Settings/SettingsScreen.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Frontend/src/components/screens/Home.jsx b/Frontend/src/components/screens/Home.jsx index bf57a1b4..81627835 100644 --- a/Frontend/src/components/screens/Home.jsx +++ b/Frontend/src/components/screens/Home.jsx @@ -31,7 +31,7 @@ const Home = () => { '/activities', `${process.env.PUBLIC_URL}/assets/images/activities.png`, 'Activities', - 'Add new purchases, sales, and dividend distributions to your activities to get an overview of previous payments!' + 'Add new purchases, sales, and dividend distributions to your activities to get an overview of previous activities!' ], 'analysis': [ 'rgb(228 126 37)', diff --git a/Frontend/src/components/screens/Settings/SettingsScreen.jsx b/Frontend/src/components/screens/Settings/SettingsScreen.jsx index 2ba00b35..9b8da453 100644 --- a/Frontend/src/components/screens/Settings/SettingsScreen.jsx +++ b/Frontend/src/components/screens/Settings/SettingsScreen.jsx @@ -69,7 +69,7 @@ const SettingsScreen = props => { }} > - Upload your previously saved data in the form of a Jason file to get back to your current state. This way you have complete control over your data! + 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! Date: Thu, 12 May 2022 18:07:41 +0200 Subject: [PATCH 6/7] feature/watchlist: making dashboard screen responsive --- .../screens/Dashboard/DashboardScreen.jsx | 18 +++++------ .../screens/Dashboard/PortfolioCharts.jsx | 19 ++++++----- .../screens/Dashboard/PortfolioOverview.jsx | 32 ++++++++----------- .../Dashboard/PortfolioPerformance.jsx | 15 ++++++--- .../screens/Dashboard/PortfolioValuechart.jsx | 2 +- 5 files changed, 42 insertions(+), 44 deletions(-) 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..2633e519 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..8f9c1fa2 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 ( - + From e2e4f10e82a13bb8314a07517af04dc91ca3ded4 Mon Sep 17 00:00:00 2001 From: Juan Carlos Miranda Carruana Date: Thu, 12 May 2022 18:11:58 +0200 Subject: [PATCH 7/7] feature/watchlist: finishing touch from dashboard screen --- Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx | 4 ++-- .../src/components/screens/Dashboard/PortfolioPerformance.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx b/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx index 2633e519..3ff7ae9f 100644 --- a/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx +++ b/Frontend/src/components/screens/Dashboard/PortfolioCharts.jsx @@ -5,13 +5,13 @@ import PortfolioValueChart from './PortfolioValuechart'; export const PortfolioCharts = props => { return ( - + - + diff --git a/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx b/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx index 8f9c1fa2..60f8b43a 100644 --- a/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx +++ b/Frontend/src/components/screens/Dashboard/PortfolioPerformance.jsx @@ -129,7 +129,7 @@ export const PortfolioPerformance = props => { + { setRealised(!realised)