From b85313d231a8e7c41612ec720cb3dba8f826c405 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Sat, 12 Feb 2022 17:54:22 +0800 Subject: [PATCH] refactor: update icons --- src/assets/img/icons.js | 34 ------------------ .../topology/utils => assets/img}/icons.ts | 20 ++++++++--- src/assets/img/{tool => tools}/ALARM.png | Bin src/assets/img/{tool => tools}/API.png | Bin src/assets/img/{tool => tools}/ENDPOINT.png | Bin src/assets/img/{tool => tools}/INSTANCE.png | Bin src/assets/img/{tool => tools}/TRACE.png | Bin src/locales/lang/en.ts | 2 ++ src/locales/lang/zh.ts | 2 ++ .../dashboard/related/topology/Settings.vue | 4 +-- .../topology/utils/images/ACTIVEMQ.png | Bin 1653 -> 0 bytes .../related/topology/utils/images/AIOHTTP.png | Bin 4170 -> 0 bytes .../related/topology/utils/images/ALARM.png | Bin 5916 -> 0 bytes .../topology/utils/images/APACHEKYLIN.png | Bin 5003 -> 0 bytes .../related/topology/utils/images/API.png | Bin 4070 -> 0 bytes .../related/topology/utils/images/APISIX.png | Bin 14603 -> 0 bytes .../related/topology/utils/images/ARMERIA.png | Bin 3587 -> 0 bytes .../related/topology/utils/images/AVRO.png | Bin 3570 -> 0 bytes .../topology/utils/images/AZUREFUNCTIONS.png | Bin 9153 -> 0 bytes .../topology/utils/images/CASSANDRA.png | Bin 5912 -> 0 bytes .../related/topology/utils/images/CELERY.jpg | Bin 6313 -> 0 bytes .../topology/utils/images/CLICKHOUSE.png | Bin 158 -> 0 bytes .../related/topology/utils/images/CUBE.png | Bin 1722 -> 0 bytes .../topology/utils/images/CUBEERROR.png | Bin 2071 -> 0 bytes .../topology/utils/images/DATABASE.png | Bin 1981 -> 0 bytes .../related/topology/utils/images/DJANGO.png | Bin 4595 -> 0 bytes .../utils/images/DOLPHINSCHEDULER.png | Bin 7084 -> 0 bytes .../related/topology/utils/images/DUBBO.png | Bin 1715 -> 0 bytes .../topology/utils/images/ELASTICSEARCH.png | Bin 2058 -> 0 bytes .../topology/utils/images/ENDPOINT.png | Bin 4702 -> 0 bytes .../topology/utils/images/ENVOYPROXY.png | Bin 5432 -> 0 bytes .../related/topology/utils/images/FALCON.png | Bin 6046 -> 0 bytes .../utils/images/FEIGNDEFAULTHTTP.png | Bin 571 -> 0 bytes .../related/topology/utils/images/FINAGLE.png | Bin 3413 -> 0 bytes .../related/topology/utils/images/FLASK.png | Bin 7822 -> 0 bytes .../related/topology/utils/images/GEAR.png | Bin 2903 -> 0 bytes .../related/topology/utils/images/GIN.png | Bin 14308 -> 0 bytes .../topology/utils/images/GOHTTPCLIENT.png | Bin 15475 -> 0 bytes .../topology/utils/images/GOHTTPSERVER.png | Bin 15475 -> 0 bytes .../topology/utils/images/GOMICROCLIENT.png | Bin 21617 -> 0 bytes .../topology/utils/images/GOMICROSERVER.png | Bin 21617 -> 0 bytes .../related/topology/utils/images/GRPC.png | Bin 1483 -> 0 bytes .../related/topology/utils/images/H2.png | Bin 1324 -> 0 bytes .../related/topology/utils/images/HBASE.png | Bin 5838 -> 0 bytes .../related/topology/utils/images/HPROSE.png | Bin 1041 -> 0 bytes .../related/topology/utils/images/HTTP.png | Bin 3495 -> 0 bytes .../topology/utils/images/HTTPCLIENT.png | Bin 3495 -> 0 bytes .../topology/utils/images/INFLUXDB.png | Bin 11955 -> 0 bytes .../topology/utils/images/INSTANCE.png | Bin 6844 -> 0 bytes .../related/topology/utils/images/JETTY.png | Bin 1069 -> 0 bytes .../topology/utils/images/JETTYSERVER.png | Bin 1573 -> 0 bytes .../related/topology/utils/images/KAFKA.png | Bin 2407 -> 0 bytes .../topology/utils/images/KAFKACONSUMER.png | Bin 2407 -> 0 bytes .../related/topology/utils/images/KONG.png | Bin 1024 -> 0 bytes .../related/topology/utils/images/KRATOS.png | Bin 9129 -> 0 bytes .../related/topology/utils/images/LIGHT4J.png | Bin 3926 -> 0 bytes .../related/topology/utils/images/LOCAL.png | Bin 2808 -> 0 bytes .../related/topology/utils/images/MARIADB.png | Bin 9849 -> 0 bytes .../related/topology/utils/images/MONGODB.png | Bin 1751 -> 0 bytes .../topology/utils/images/MONGOOSE.png | Bin 6180 -> 0 bytes .../related/topology/utils/images/MOSN.png | Bin 3990 -> 0 bytes .../related/topology/utils/images/MOTAN.png | Bin 2609 -> 0 bytes .../related/topology/utils/images/MYSQL.png | Bin 600 -> 0 bytes .../related/topology/utils/images/NGINX.png | Bin 4893 -> 0 bytes .../related/topology/utils/images/OKHTTP.png | Bin 695 -> 0 bytes .../related/topology/utils/images/ORACLE.png | Bin 1857 -> 0 bytes .../related/topology/utils/images/PHP.png | Bin 9471 -> 0 bytes .../related/topology/utils/images/PLAY.png | Bin 2228 -> 0 bytes .../topology/utils/images/POSTGRESQL.png | Bin 2430 -> 0 bytes .../related/topology/utils/images/PULSAR.png | Bin 2409 -> 0 bytes .../related/topology/utils/images/PYRAMID.png | Bin 14140 -> 0 bytes .../related/topology/utils/images/PYTHON.png | Bin 16406 -> 0 bytes .../topology/utils/images/RABBITMQ.png | Bin 427 -> 0 bytes .../related/topology/utils/images/REDIS.png | Bin 2025 -> 0 bytes .../topology/utils/images/REQUESTS.png | Bin 1609 -> 0 bytes .../related/topology/utils/images/RESIN.png | Bin 2369 -> 0 bytes .../topology/utils/images/RESTEASY.png | Bin 2038 -> 0 bytes .../topology/utils/images/ROCKETMQ.png | Bin 1670 -> 0 bytes .../related/topology/utils/images/SANIC.png | Bin 13600 -> 0 bytes .../related/topology/utils/images/SEATA.png | Bin 3692 -> 0 bytes .../topology/utils/images/SERVICECOMB.png | Bin 6220 -> 0 bytes .../utils/images/SERVICECOMBMESHER.png | Bin 6724 -> 0 bytes .../utils/images/SERVICECOMBSERVICECENTER.png | Bin 6926 -> 0 bytes .../related/topology/utils/images/SOFARPC.png | Bin 2371 -> 0 bytes .../related/topology/utils/images/SOLR.png | Bin 1191 -> 0 bytes .../topology/utils/images/SPRINGMVC.png | Bin 1685 -> 0 bytes .../related/topology/utils/images/STRUTS2.png | Bin 1562 -> 0 bytes .../related/topology/utils/images/TOMCAT.png | Bin 1837 -> 0 bytes .../related/topology/utils/images/TORNADO.png | Bin 9784 -> 0 bytes .../related/topology/utils/images/TRACE.png | Bin 4853 -> 0 bytes .../topology/utils/images/UNDEFINED.png | Bin 1094 -> 0 bytes .../related/topology/utils/images/UNKNOWN.png | Bin 1522 -> 0 bytes .../topology/utils/images/UNKNOWN_CLOUD.png | Bin 2122 -> 0 bytes .../related/topology/utils/images/URLLIB3.png | Bin 702 -> 0 bytes .../related/topology/utils/images/USER.png | Bin 1273 -> 0 bytes .../related/topology/utils/images/VERTX.png | Bin 12031 -> 0 bytes .../topology/utils/images/ZOOKEEPER.png | Bin 4847 -> 0 bytes .../related/topology/utils/legend.ts | 2 +- .../related/topology/utils/nodeElement.ts | 2 +- .../dashboard/related/topology/utils/tool.ts | 2 +- 100 files changed, 25 insertions(+), 43 deletions(-) delete mode 100755 src/assets/img/icons.js rename src/{views/dashboard/related/topology/utils => assets/img}/icons.ts (72%) rename src/assets/img/{tool => tools}/ALARM.png (100%) rename src/assets/img/{tool => tools}/API.png (100%) rename src/assets/img/{tool => tools}/ENDPOINT.png (100%) rename src/assets/img/{tool => tools}/INSTANCE.png (100%) rename src/assets/img/{tool => tools}/TRACE.png (100%) delete mode 100755 src/views/dashboard/related/topology/utils/images/ACTIVEMQ.png delete mode 100644 src/views/dashboard/related/topology/utils/images/AIOHTTP.png delete mode 100644 src/views/dashboard/related/topology/utils/images/ALARM.png delete mode 100644 src/views/dashboard/related/topology/utils/images/APACHEKYLIN.png delete mode 100644 src/views/dashboard/related/topology/utils/images/API.png delete mode 100644 src/views/dashboard/related/topology/utils/images/APISIX.png delete mode 100755 src/views/dashboard/related/topology/utils/images/ARMERIA.png delete mode 100755 src/views/dashboard/related/topology/utils/images/AVRO.png delete mode 100644 src/views/dashboard/related/topology/utils/images/AZUREFUNCTIONS.png delete mode 100755 src/views/dashboard/related/topology/utils/images/CASSANDRA.png delete mode 100644 src/views/dashboard/related/topology/utils/images/CELERY.jpg delete mode 100644 src/views/dashboard/related/topology/utils/images/CLICKHOUSE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/CUBE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/CUBEERROR.png delete mode 100755 src/views/dashboard/related/topology/utils/images/DATABASE.png delete mode 100644 src/views/dashboard/related/topology/utils/images/DJANGO.png delete mode 100644 src/views/dashboard/related/topology/utils/images/DOLPHINSCHEDULER.png delete mode 100755 src/views/dashboard/related/topology/utils/images/DUBBO.png delete mode 100755 src/views/dashboard/related/topology/utils/images/ELASTICSEARCH.png delete mode 100644 src/views/dashboard/related/topology/utils/images/ENDPOINT.png delete mode 100644 src/views/dashboard/related/topology/utils/images/ENVOYPROXY.png delete mode 100644 src/views/dashboard/related/topology/utils/images/FALCON.png delete mode 100755 src/views/dashboard/related/topology/utils/images/FEIGNDEFAULTHTTP.png delete mode 100755 src/views/dashboard/related/topology/utils/images/FINAGLE.png delete mode 100644 src/views/dashboard/related/topology/utils/images/FLASK.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GEAR.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GIN.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GOHTTPCLIENT.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GOHTTPSERVER.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GOMICROCLIENT.png delete mode 100644 src/views/dashboard/related/topology/utils/images/GOMICROSERVER.png delete mode 100755 src/views/dashboard/related/topology/utils/images/GRPC.png delete mode 100755 src/views/dashboard/related/topology/utils/images/H2.png delete mode 100644 src/views/dashboard/related/topology/utils/images/HBASE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/HPROSE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/HTTP.png delete mode 100755 src/views/dashboard/related/topology/utils/images/HTTPCLIENT.png delete mode 100644 src/views/dashboard/related/topology/utils/images/INFLUXDB.png delete mode 100644 src/views/dashboard/related/topology/utils/images/INSTANCE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/JETTY.png delete mode 100755 src/views/dashboard/related/topology/utils/images/JETTYSERVER.png delete mode 100755 src/views/dashboard/related/topology/utils/images/KAFKA.png delete mode 100755 src/views/dashboard/related/topology/utils/images/KAFKACONSUMER.png delete mode 100644 src/views/dashboard/related/topology/utils/images/KONG.png delete mode 100644 src/views/dashboard/related/topology/utils/images/KRATOS.png delete mode 100755 src/views/dashboard/related/topology/utils/images/LIGHT4J.png delete mode 100755 src/views/dashboard/related/topology/utils/images/LOCAL.png delete mode 100644 src/views/dashboard/related/topology/utils/images/MARIADB.png delete mode 100755 src/views/dashboard/related/topology/utils/images/MONGODB.png delete mode 100644 src/views/dashboard/related/topology/utils/images/MONGOOSE.png delete mode 100644 src/views/dashboard/related/topology/utils/images/MOSN.png delete mode 100755 src/views/dashboard/related/topology/utils/images/MOTAN.png delete mode 100755 src/views/dashboard/related/topology/utils/images/MYSQL.png delete mode 100755 src/views/dashboard/related/topology/utils/images/NGINX.png delete mode 100755 src/views/dashboard/related/topology/utils/images/OKHTTP.png delete mode 100755 src/views/dashboard/related/topology/utils/images/ORACLE.png delete mode 100644 src/views/dashboard/related/topology/utils/images/PHP.png delete mode 100755 src/views/dashboard/related/topology/utils/images/PLAY.png delete mode 100755 src/views/dashboard/related/topology/utils/images/POSTGRESQL.png delete mode 100755 src/views/dashboard/related/topology/utils/images/PULSAR.png delete mode 100644 src/views/dashboard/related/topology/utils/images/PYRAMID.png delete mode 100644 src/views/dashboard/related/topology/utils/images/PYTHON.png delete mode 100755 src/views/dashboard/related/topology/utils/images/RABBITMQ.png delete mode 100755 src/views/dashboard/related/topology/utils/images/REDIS.png delete mode 100644 src/views/dashboard/related/topology/utils/images/REQUESTS.png delete mode 100755 src/views/dashboard/related/topology/utils/images/RESIN.png delete mode 100755 src/views/dashboard/related/topology/utils/images/RESTEASY.png delete mode 100755 src/views/dashboard/related/topology/utils/images/ROCKETMQ.png delete mode 100644 src/views/dashboard/related/topology/utils/images/SANIC.png delete mode 100644 src/views/dashboard/related/topology/utils/images/SEATA.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SERVICECOMB.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SERVICECOMBMESHER.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SERVICECOMBSERVICECENTER.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SOFARPC.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SOLR.png delete mode 100755 src/views/dashboard/related/topology/utils/images/SPRINGMVC.png delete mode 100755 src/views/dashboard/related/topology/utils/images/STRUTS2.png delete mode 100755 src/views/dashboard/related/topology/utils/images/TOMCAT.png delete mode 100644 src/views/dashboard/related/topology/utils/images/TORNADO.png delete mode 100644 src/views/dashboard/related/topology/utils/images/TRACE.png delete mode 100755 src/views/dashboard/related/topology/utils/images/UNDEFINED.png delete mode 100755 src/views/dashboard/related/topology/utils/images/UNKNOWN.png delete mode 100755 src/views/dashboard/related/topology/utils/images/UNKNOWN_CLOUD.png delete mode 100644 src/views/dashboard/related/topology/utils/images/URLLIB3.png delete mode 100755 src/views/dashboard/related/topology/utils/images/USER.png delete mode 100644 src/views/dashboard/related/topology/utils/images/VERTX.png delete mode 100644 src/views/dashboard/related/topology/utils/images/ZOOKEEPER.png diff --git a/src/assets/img/icons.js b/src/assets/img/icons.js deleted file mode 100755 index 8c669f60..00000000 --- a/src/assets/img/icons.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -const requireComponent = require.context("../../assets", false, /\.png$/); - -const result = {}; -function capitalizeFirstLetter(str) { - return str.toUpperCase(); -} -function validateFileName(str) { - return ( - /^\S+\.png$/.test(str) && - str.replace(/^\S+\/(\w+)\.png$/, (rs, $1) => capitalizeFirstLetter($1)) - ); -} -requireComponent.keys().forEach((filePath) => { - const componentConfig = requireComponent(filePath); - const fileName = validateFileName(filePath); - result[fileName] = componentConfig; -}); -export default result; diff --git a/src/views/dashboard/related/topology/utils/icons.ts b/src/assets/img/icons.ts similarity index 72% rename from src/views/dashboard/related/topology/utils/icons.ts rename to src/assets/img/icons.ts index c9d05939..396bbdd5 100755 --- a/src/views/dashboard/related/topology/utils/icons.ts +++ b/src/assets/img/icons.ts @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -const requireComponent = require.context("./images", false, /\.png$/); - +const requireComponent = require.context("./technologies", false, /\.png$/); +const requireTool = require.context("./tools", false, /\.png$/); const result: { [key: string]: string } = {}; +const t: { [key: string]: string } = {}; + function capitalizeFirstLetter(str: string) { return str.toUpperCase(); } @@ -27,11 +29,21 @@ function validateFileName(str: string): string | undefined { ); } } -requireComponent.keys().forEach((filePath: string) => { +[...requireComponent.keys()].forEach((filePath: string) => { const componentConfig = requireComponent(filePath); + const fileName = validateFileName(filePath); if (fileName) { result[fileName] = componentConfig; } }); -export default result; +[...requireTool.keys()].forEach((filePath: string) => { + const componentConfig = requireTool(filePath); + + const fileName = validateFileName(filePath); + if (fileName) { + t[fileName] = componentConfig; + } +}); + +export default { ...result, ...t }; diff --git a/src/assets/img/tool/ALARM.png b/src/assets/img/tools/ALARM.png similarity index 100% rename from src/assets/img/tool/ALARM.png rename to src/assets/img/tools/ALARM.png diff --git a/src/assets/img/tool/API.png b/src/assets/img/tools/API.png similarity index 100% rename from src/assets/img/tool/API.png rename to src/assets/img/tools/API.png diff --git a/src/assets/img/tool/ENDPOINT.png b/src/assets/img/tools/ENDPOINT.png similarity index 100% rename from src/assets/img/tool/ENDPOINT.png rename to src/assets/img/tools/ENDPOINT.png diff --git a/src/assets/img/tool/INSTANCE.png b/src/assets/img/tools/INSTANCE.png similarity index 100% rename from src/assets/img/tool/INSTANCE.png rename to src/assets/img/tools/INSTANCE.png diff --git a/src/assets/img/tool/TRACE.png b/src/assets/img/tools/TRACE.png similarity index 100% rename from src/assets/img/tool/TRACE.png rename to src/assets/img/tools/TRACE.png diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 7d368a34..704133ef 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -81,6 +81,8 @@ const msg = { nodeMetrics: "Metrics related with topology nodes", instanceDashboard: "Dashboard name related with service instances", endpointDashboard: "Dashboard name related with endpoints", + callSettings: "Call settings", + nodeSettings: "Node Settings", hourTip: "Select Hour", minuteTip: "Select Minute", secondTip: "Select Second", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 2a31de40..00170ac2 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -80,6 +80,8 @@ const msg = { nodeMetrics: "拓扑节点关联的指标", instanceDashboard: "拓节点关联的实例的仪表板名称", endpointDashboard: "拓节点端点的实例的仪表板名称", + callSettings: "拓扑线设置", + nodeSettings: "拓扑点设置", hourTip: "选择小时", minuteTip: "选择分钟", secondTip: "选择秒数", diff --git a/src/views/dashboard/related/topology/Settings.vue b/src/views/dashboard/related/topology/Settings.vue index d0347e82..f3b83b1f 100644 --- a/src/views/dashboard/related/topology/Settings.vue +++ b/src/views/dashboard/related/topology/Settings.vue @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -->