Skip to content

Commit 74d5e9d

Browse files
authored
Merge pull request #24 from Umius-Brian/Stretch-Features
Added some headers and tweaked font
2 parents 02c6d35 + a317511 commit 74d5e9d

11 files changed

+59
-32
lines changed

app/charts/docker-stats-chart.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ const DockerStatsChart = (props) => {
7676
</span>
7777
)
7878
}
79+
7980
console.log('dockerStatsArr (docker stats chart):', dockerStatsArr);
8081
return (
8182
<div id="docker-stats-chart">

app/charts/latency-chart.jsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,28 @@ const LatencyChart = (props) => {
2626
y: yAxis,
2727
mode: 'lines',
2828
rangemode: 'nonnegative',
29-
name: `${props.service} CPU Latency`,
29+
// name: `${props.service} CPU Latency`,
30+
name: 'CPU Latency',
3031
marker: {
31-
color: 'rgb(218, 170, 23',
32+
color: '#daaa17',
3233
},
3334
}]}
3435
layout = {{
3536
height: 400,
3637
width: 400,
3738
font: {
3839
color: 'black',
39-
size: 15
40+
size: 15,
41+
family: 'Nunito, san serif'
4042
},
4143
paper_bgcolor: 'white',
4244
plot_bgcolor: 'white',
4345
showlegend: true,
4446
legend: {
45-
orientation: 'h',
46-
xanchor: 'center',
47-
x: .5
47+
orientation: 'h',
48+
xanchor: 'center',
49+
x: 0.5,
50+
y: 5,
4851
},
4952
xaxis: {
5053
tickmode: 'linear',

app/charts/memory-chart.jsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const MemoryChart = (props) => {
3636
data = {[
3737
{
3838
type: 'scatter',
39-
fill: 'tozeroy',
39+
fill: 'tonexty',
4040
fillcolor: 'rgb(0, 237, 160)',
4141
mode: 'none',
4242
x: {autorange: true},
@@ -46,8 +46,8 @@ const MemoryChart = (props) => {
4646
},
4747
{
4848
type: 'scatter',
49-
fill: 'tozeroy',
50-
fillcolor: 'rgba(0, 237, 160, .5)',
49+
fill: 'tonexty',
50+
fillcolor: 'rgba(0, 237, 160, .4)',
5151
mode: 'none',
5252
x: {autorange: true},
5353
y: used,
@@ -56,8 +56,8 @@ const MemoryChart = (props) => {
5656
},
5757
{
5858
type: 'scatter',
59-
fill: 'tozeroy',
60-
fillcolor: 'rgba(74, 78, 238, .7)',
59+
fill: 'tonexty',
60+
fillcolor: 'rgba(74, 78, 238, .5)',
6161
mode: 'none',
6262
x: {autorange: true},
6363
y: active,
@@ -71,7 +71,8 @@ const MemoryChart = (props) => {
7171
width: 400,
7272
font: {
7373
color: 'black',
74-
size: 15
74+
size: 15,
75+
family: 'Nunito, san serif'
7576
},
7677
paper_bgcolor: 'white',
7778
plot_bgcolor: 'white',

app/charts/microservice-traffic.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ const MicroServiceTraffic = (props) => {
9494
width: 400,
9595
font: {
9696
color: 'black',
97-
size: 15
97+
size: 15,
98+
family: 'Nunito, san serif'
9899
},
99100
paper_bgcolor: 'white',
100101
plot_bgcolor: 'white',

app/charts/processes-chart.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ const ProcessesChart = (props) => {
7575
width: 400,
7676
font: {
7777
color: 'black',
78-
size: 15
78+
size: 15,
79+
family: 'Nunito, san serif'
7980
},
8081
paper_bgcolor: 'white',
8182
plot_bgcolor: 'white',

app/charts/request-type-chart.jsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const RequestTypesChart = (props) => {
2929
values: Object.values(requestObj),
3030
labels: ['DELETE', 'GET', 'PATCH', 'POST', 'PUSH', 'PUT'],
3131
type: 'pie',
32-
name: 'Request Types',
32+
textposition: 'inside',
3333
marker: {
3434
'colors': [
3535
'#fa1a58',
@@ -42,11 +42,16 @@ const RequestTypesChart = (props) => {
4242
},
4343
}]}
4444
layout = {{
45+
title: {
46+
text: 'Request Types',
47+
font: {size: 22}
48+
},
4549
height: 400,
4650
width: 400,
4751
font: {
4852
color: 'black',
49-
size: 15
53+
size: 15,
54+
family: 'Nunito, san serif'
5055
},
5156
displaylogo: false,
5257
paper_bgcolor: 'white',

app/charts/response-code-chart.jsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,17 @@ const ResponseCodeChart = (props) => {
6262
labels: [
6363
'Informational 1xx',
6464
'Successful 2xx',
65-
'Redirection 3xx',
65+
'Redirectional 3xx',
6666
'Client Error 4xx',
6767
'Server Error 5xx',
6868
],
6969
type: 'pie',
70+
textposition: 'inside',
7071
domain: { y: [0, 2] },
7172
marker: {
7273
colors: [
7374
'#fa1a58',
74-
'#f3f5fa',
75+
'#f3f5fe',
7576
'#00eda0',
7677
'#00fff2',
7778
'#73605b',
@@ -80,19 +81,23 @@ const ResponseCodeChart = (props) => {
8081
},
8182
]}
8283
layout={{
84+
title: {
85+
text: 'Response Status Codes',
86+
font: {size: 22}
87+
},
8388
height: 400,
8489
width: 400,
8590
font: {
8691
color: 'black',
87-
size: 15
92+
size: 15,
93+
family: 'Nunito, san serif'
8894
},
8995
displaylogo: false,
9096
paper_bgcolor: 'white',
9197
legend: {
92-
orientation: 'h',
93-
xanchor: 'center',
94-
x: 0.5,
95-
y: 5,
98+
orientation: 'h',
99+
xanchor: 'center',
100+
x: .5
96101
},
97102
}}
98103
/>

app/charts/speed-chart.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const SpeedChart = (props) => {
3030
domain: { x: [0, 1], y: [0, 1] },
3131
type: 'indicator',
3232
value: yAxis[yAxis.length - 1],
33-
title: {'text': "Speed Chart"},
33+
title: {text: "Speed Chart", font: {size: 22}},
3434
delta: {'reference': 3.5, 'decreasing': {'color': '#FA1A58'}},
3535
mode: "gauge+number+delta",
3636
gauge: { axis: { range: [null, 8] },
@@ -54,7 +54,8 @@ const SpeedChart = (props) => {
5454
width: 400,
5555
font: {
5656
color: 'black',
57-
size: 15
57+
size: 15,
58+
family: 'Nunito, san serif'
5859
},
5960
paper_bgcolor: 'white',
6061
legend: {

app/charts/temperature-chart.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ const TemperatureChart = (props) => {
4242
width: 400,
4343
font: {
4444
color: 'black',
45-
size: 15
45+
size: 15,
46+
family: 'Nunito, san serif'
4647
},
4748
paper_bgcolor: 'white',
4849
plot_bgcolor: 'white',

app/stylesheets/graphs.css

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
display: grid;
33
grid-template-columns: auto auto auto;
44
grid-gap: 30px; /* align-items: center; */
5-
margin: auto;
5+
margin: auto;
6+
padding-bottom: 25px;
7+
border-radius: 2px;
8+
box-shadow: 2px 2px 2px rgba(216, 210, 247, .5);
69
}
710

811

@@ -13,12 +16,11 @@ svg {
1316

1417
#docker-stats-chart {
1518
position: relative;
16-
font-family: "Open Sans", verdana, arial, sans-serif;
1719
display: flex;
1820
flex-direction: column;
1921
background-color: white;
20-
border-radius: 2px;
21-
box-shadow: 2px 2px 2px rgba(216, 210, 247, .5);
22+
border-radius: 3px;
23+
box-shadow: 3px 3px 3px rgba(216, 210, 247, .5);
2224
height: 400;
2325
width: 400;
2426
padding: 10px 10px 10px 10px;
@@ -27,4 +29,8 @@ svg {
2729
#docker-stats-chart-header {
2830
align-self: center;
2931
font-size: 1.5em;
30-
}
32+
padding-bottom: 25px;
33+
height: 400;
34+
width: 400;
35+
}
36+

0 commit comments

Comments
 (0)