Skip to content

Commit 452824f

Browse files
committed
Minor tweaks to github messages.
1 parent e2204da commit 452824f

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

src/components/css/static.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
.fa-box-open {
2-
content: url(../svg/running.svg);
2+
content: url(../../../assets/running.svg);
33
width: 22px;
44
color: black;
55
}
66

77
.fa-archive {
8-
content: url(../svg/stopped.svg);
8+
content: url(../../../assets/stopped.svg);
99
width: 22px;
1010
}
1111

1212
.fa-database {
13-
content: url(../svg/images.svg);
13+
content: url(../../../assets/images.svg);
1414
width: 22px;
1515
}
1616

1717
.fa-chart-pie {
18-
content: url(../svg/metrics.svg);
18+
content: url(../../../assets/metrics.svg);
1919
width: 22px;
2020
}
2121

2222
.fa-file-upload {
23-
content: url(../svg/docker-compose.svg);
23+
content: url(../../../assets/docker-compose.svg);
2424
width: 22px;
2525
}
2626

2727
.fa-settings {
28-
content: url(../svg/settings.svg);
28+
content: url(../../../assets/settings.svg);
2929
width: 22px;
3030
}
3131

3232
.fa-volume-history {
33-
content: url(../svg/volumehistory.svg);
33+
content: url(../../../assets/volumehistory.svg);
3434
width: 22px;
3535
}
3636

3737
.fa-users {
38-
content: url(../svg/users.svg);
38+
content: url(../../../assets/users.svg);
3939
width: 22px;
4040
}
4141

4242
.fa-file {
43-
content: url(../svg/document.svg);
43+
content: url(../../../assets/document.svg);
4444
width: 70px;
4545
}
4646

4747
.fa-log {
48-
content: url(../svg/docketeer-logs.svg);
48+
content: url(../../../assets/docketeer-logs.svg);
4949
width: 22px;
5050
}

src/components/css/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@font-face {
22
font-family: "Maven Pro";
3-
src: url(../font/MavenPro-Regular.ttf);
3+
src: url(./font/MavenPro-Regular.ttf);
44
}
55
* {
66
font-family: "Maven Pro", sans-serif;

src/components/display/LineChartDisplay.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@ import { useSelector, useDispatch } from 'react-redux';
33
import { Line, Bar } from 'react-chartjs-2';
44
import * as actions from '../../redux/actions/actions';
55
import * as helper from '../helper/commands';
6-
<<<<<<< HEAD
7-
import { Link } from 'react-router-dom';
8-
import { FormControlLabel, Checkbox, FormGroup } from '@mui/material';
9-
=======
106
import { DataGrid } from '@mui/x-data-grid';
117
import { FormControlLabel, Checkbox } from '@mui/material';
12-
>>>>>>> dev
138

149
/**
1510
* Displays linegraph and github metrics
@@ -279,7 +274,17 @@ const LineChartDisplay = () => {
279274
time = ob.time;
280275
author = ob.author;
281276
url = ob.url;
282-
message = ob.message;
277+
message = '';
278+
if (ob.message){
279+
if (ob.message.includes('<')){
280+
for (let i = 0; i < ob.message.length; i++) {
281+
if (ob.message[i] === '<') break
282+
message += ob.message[i];
283+
}
284+
} else {
285+
message = ob.message
286+
}
287+
}
283288

284289
time = time.split('T');
285290
date = time[0];

0 commit comments

Comments
 (0)