diff --git a/frontend/src/components/details/ColumnChartComponent.jsx b/frontend/src/components/details/ColumnChartComponent.jsx
index ae9a93df..468ed7cd 100644
--- a/frontend/src/components/details/ColumnChartComponent.jsx
+++ b/frontend/src/components/details/ColumnChartComponent.jsx
@@ -24,7 +24,7 @@ const ColumnChartComponent = () => {
plotOptions: {
bar: {
- columnWidth: '70%',
+ columnWidth: '75%',
BorderRadius: 10,
dataLabels: {
position: 'top' // top, center, bottom
@@ -42,7 +42,7 @@ const ColumnChartComponent = () => {
},
offsetY: -20,
style: {
- fontSize: '12px',
+ fontSize: '10px',
colors: ['#21cc82']
}
},
@@ -63,7 +63,7 @@ const ColumnChartComponent = () => {
labels: {
rotate: -90,
style: {
- fontSize: 10
+ fontSize: 6.8,
}
},
responsive: [
@@ -71,7 +71,7 @@ const ColumnChartComponent = () => {
breakpoint: 6400,
options: {
chart: {
- width: 500
+ width: 600
},
legend: {
position: 'bottom'
diff --git a/frontend/src/components/details/PieChartComponent.jsx b/frontend/src/components/details/PieChartComponent.jsx
index 60422544..b8b45be0 100644
--- a/frontend/src/components/details/PieChartComponent.jsx
+++ b/frontend/src/components/details/PieChartComponent.jsx
@@ -45,7 +45,7 @@ const PieChartComponent = () => {
breakpoint: 6400,
options: {
chart: {
- heigt: 'auto'
+ height: 'auto'
},
legend: {
position: 'bottom'
@@ -54,10 +54,9 @@ const PieChartComponent = () => {
}
]
};
- //lassName='ChartItems' cause PieChart to overlap: needs to be fixed in charts_tables.css
- // works fine if className is taken out
+
return (
-
+
);
diff --git a/frontend/src/components/details/charts_tables.css b/frontend/src/components/details/charts_tables.css
index 84c39e20..4dfeebc8 100644
--- a/frontend/src/components/details/charts_tables.css
+++ b/frontend/src/components/details/charts_tables.css
@@ -32,6 +32,7 @@
margin-bottom: 10px;
width: 100%;
height: 300px;
+ padding-bottom:10px;
}
/* Column Chart */
@@ -43,9 +44,10 @@
cursor: 'pointer';
min-width: 360;
max-width: 450;
- min-height: 500px;
+ min-height: 600px;
max-height: 600px;
- margin-top: 10px;
+ margin-top: 25px;
+ margin-bottom:50px;
}
.PieChartCardsContainer {
diff --git a/frontend/src/components/mydashboard/MydashboardItemComponent.js b/frontend/src/components/mydashboard/MydashboardItemComponent.js
index c9d1d5b6..c2386255 100644
--- a/frontend/src/components/mydashboard/MydashboardItemComponent.js
+++ b/frontend/src/components/mydashboard/MydashboardItemComponent.js
@@ -83,14 +83,7 @@ function MydashboardItemComponent() {
const theme = useTheme();
const classes = useStyles({ theme });
- // function renderLegend(color, title) {
- // return (
- //
- //
- // {title}
- //
- // );
- // }
+
function renderMiniCards(title, value) {
return (
@@ -114,7 +107,7 @@ function MydashboardItemComponent() {
);
}
- function renderStat(title, value) {
+ function renderCards(title, value) {
return (
- {renderMiniCards('Air Quality Results', '50%')}
+ {renderMiniCards('Opened projects', '4')}
- {renderMiniCards('Air Quality Results', '90%')}
+ {renderMiniCards('Recently opened', '2')}
- {renderMiniCards('Air Quality Results', '30%')}
+ {renderMiniCards('Closed projects', '1')}
@@ -198,15 +191,13 @@ function MydashboardItemComponent() {
Favorites
- {renderStat('Fav Project 1', 'Transmission')}
- {renderStat('Fav Project 2', 'Generation')}
- {renderStat('Fav Project 3', 'Industrial App')}
- {renderStat('Fav Project 1', 'Transmission')}
- {renderStat('Fav Project 2', 'Generation')}
- {renderStat('Fav Project 3', 'Industrial App')}
- {renderStat('Fav Project 1', 'Transmission')}
- {renderStat('Fav Project 2', 'Generation')}
- {renderStat('Fav Project 3', 'Industrial App')}
+ {renderCards('Fav Project 1', 'Transmission')}
+ {renderCards('Fav Project 2', 'Generation')}
+ {renderCards('Fav Project 3', 'Industrial App')}
+ {renderCards('Fav Project 1', 'Transmission')}
+ {renderCards('Fav Project 2', 'Generation')}
+ {renderCards('Fav Project 3', 'Industrial App')}
+
@@ -227,12 +218,12 @@ function MydashboardItemComponent() {
Question1 answer
-
+
-
+
@@ -242,14 +233,14 @@ function MydashboardItemComponent() {
-
+
My charts
-
+
My charts
@@ -280,7 +271,7 @@ function MydashboardItemComponent() {
target='_blank'
className='w3-hover-text-green'
>
- Siemens
+ Siemens Energy
diff --git a/frontend/src/components/mydashboard/mydashboard.css b/frontend/src/components/mydashboard/mydashboard.css
index fd3df4ad..904e6f31 100644
--- a/frontend/src/components/mydashboard/mydashboard.css
+++ b/frontend/src/components/mydashboard/mydashboard.css
@@ -37,6 +37,23 @@
overflow-y: scroll;
justify-content: first baseline;
}
+
+.MyChartCardsContainer {
+
+ display: flex;
+ flex-direction: column;
+ background-color: #ffffff;
+ cursor: 'pointer';
+ margin-top: 15px;
+ min-width: 360;
+ max-width: 450;
+ min-height: 550px;
+ max-height: 550px;
+ border: 1px solid #ad65dd;
+ position: fixed;
+ overflow-y: scroll;
+ justify-content: first baseline;
+}
.MyMiniCardsContainer {
display: flex;