You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/05 03:00:16 UTC
[incubator-skywalking-ui] branch fix/e2e updated: Refactor icon
image folder
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/e2e
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
The following commit(s) were added to refs/heads/fix/e2e by this push:
new a21187c Refactor icon image folder
a21187c is described below
commit a21187c40174d2a9c0ee37ec5304bab4d1f4d2ce
Author: hanahmily <ha...@gmail.com>
AuthorDate: Mon Mar 5 10:59:26 2018 +0800
Refactor icon image folder
---
public/alert.png | Bin 4326 -> 0 bytes
public/app.jpg | Bin 8847 -> 0 bytes
public/app.svg | 1 -
public/data.png | Bin 7245 -> 0 bytes
public/database.png | Bin 6665 -> 0 bytes
public/favicon.png | Bin 3825 -> 0 bytes
public/mq.png | Bin 2412 -> 0 bytes
public/service.svg | 1 -
src/components/Topology/AppTopology.js | 4 ++--
src/components/Topology/ServiceTopology.js | 2 +-
src/routes/Dashboard/Dashboard.js | 10 +++++-----
11 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/public/alert.png b/public/alert.png
deleted file mode 100644
index e24e202..0000000
Binary files a/public/alert.png and /dev/null differ
diff --git a/public/app.jpg b/public/app.jpg
deleted file mode 100644
index 8d8166d..0000000
Binary files a/public/app.jpg and /dev/null differ
diff --git a/public/app.svg b/public/app.svg
deleted file mode 100644
index 4116c21..0000000
--- a/public/app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M357.885 49.289h285.276c173.87 0 316.906 143.086 316.906 317.854v285.276c0 173.831-143.086 316.925-316.906 316.925h-285.276c-174.749 0-317.854-143.086-317.854-316.925v-285.276c0-174.749 143.086-317.854 317.854-317.854z" fill= [...]
\ No newline at end of file
diff --git a/public/data.png b/public/data.png
deleted file mode 100644
index 7c15d62..0000000
Binary files a/public/data.png and /dev/null differ
diff --git a/public/database.png b/public/database.png
deleted file mode 100644
index 048034f..0000000
Binary files a/public/database.png and /dev/null differ
diff --git a/public/favicon.png b/public/favicon.png
deleted file mode 100644
index 240c9c3..0000000
Binary files a/public/favicon.png and /dev/null differ
diff --git a/public/mq.png b/public/mq.png
deleted file mode 100644
index b04d92b..0000000
Binary files a/public/mq.png and /dev/null differ
diff --git a/public/service.svg b/public/service.svg
deleted file mode 100644
index 8d2daf7..0000000
--- a/public/service.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M151.3048309167421 870.0138201689984c199.20612239587413 199.20612239587422 522.1842157706417 199.20612239587433 721.3924594868594-0.002121320343348998 199.2068295026554-199.20682950265532 199.20682950265544-522.1849228774227 [...]
\ No newline at end of file
diff --git a/src/components/Topology/AppTopology.js b/src/components/Topology/AppTopology.js
index ff4c3b1..878e36e 100644
--- a/src/components/Topology/AppTopology.js
+++ b/src/components/Topology/AppTopology.js
@@ -68,8 +68,8 @@ export default class AppTopology extends Base {
<div class="node-percentage">${data.sla}%</div>
<div>${data.callsPerSec} calls/s</div>
<div>
- <img src="data.png" class="${styles.logo}"/>${data.numOfServer}
- <img src="alert.png" class="${styles.logo}"/>
+ <img src="img/icon/data.png" class="${styles.logo}"/>${data.numOfServer}
+ <img src="img/icon/alert.png" class="${styles.logo}"/>
<span class="${styles.alert}">${data.numOfServerAlarm}</span>
</div>
<div>${data.apdex} Apdex</div>
diff --git a/src/components/Topology/ServiceTopology.js b/src/components/Topology/ServiceTopology.js
index 9d727dd..b6fb63f 100644
--- a/src/components/Topology/ServiceTopology.js
+++ b/src/components/Topology/ServiceTopology.js
@@ -66,7 +66,7 @@ export default class ServiceTopology extends Base {
<div class="node-percentage">${data.sla / 100}%</div>
<div>${data.calls} calls/s</div>
<div>
- <img src="alert.png" class="${styles.logo}"/>
+ <img src="img/icon/alert.png" class="${styles.logo}"/>
<span class="${styles.alert}">${data.numOfServiceAlarm}</span>
</div>
</div>`;
diff --git a/src/routes/Dashboard/Dashboard.js b/src/routes/Dashboard/Dashboard.js
index 497a5af..721e519 100644
--- a/src/routes/Dashboard/Dashboard.js
+++ b/src/routes/Dashboard/Dashboard.js
@@ -39,21 +39,21 @@ export default class Dashboard extends PureComponent {
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="App"
- avatar={<img style={{ width: 56, height: 56 }} src="app.svg" alt="app" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/app.svg" alt="app" />}
total={data.getClusterBrief.numOfApplication}
/>
</Col>
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="Service"
- avatar={<img style={{ width: 56, height: 56 }} src="service.svg" alt="service" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/service.svg" alt="service" />}
total={data.getClusterBrief.numOfService}
/>
</Col>
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="DB & Cache"
- avatar={<img style={{ width: 64, height: 64 }} src="database.png" alt="database" />}
+ avatar={<img style={{ width: 64, height: 64 }} src="img/icon/database.png" alt="database" />}
total={data.getClusterBrief.numOfDatabase
+ data.getClusterBrief.numOfCache}
/>
@@ -61,7 +61,7 @@ export default class Dashboard extends PureComponent {
<Col xs={24} sm={24} md={12} lg={6} xl={6}>
<ChartCard
title="MQ"
- avatar={<img style={{ width: 56, height: 56 }} src="mq.png" alt="mq" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/mq.png" alt="mq" />}
total={data.getClusterBrief.numOfMQ}
/>
</Col>
@@ -70,7 +70,7 @@ export default class Dashboard extends PureComponent {
<Col xs={24} sm={24} md={24} lg={12} xl={12} style={{ marginTop: 24 }}>
<ChartCard
title="Avg Application Alarm"
- avatar={<img style={{ width: 56, height: 56 }} src="alert.png" alt="app" />}
+ avatar={<img style={{ width: 56, height: 56 }} src="img/icon/alert.png" alt="app" />}
total={`${avg.toFixed(2)}%`}
footer={<div><Field label="Max" value={`${max}%`} /> <Field label="Min" value={`${min}%`} /></div>}
contentHeight={100}
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.