diff --git a/package.json b/package.json
index 9abe0a8..7806502 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"url": "https://github.com/krwu/ServerStatus-web.git"
},
"dependencies": {
+ "@ant-design/icons": "^4.6.4",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
@@ -27,7 +28,7 @@
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
- "antd": "^3.26.20",
+ "antd": "^4.0.0",
"babel-plugin-import": "^1.13.1",
"customize-cra": "^1.0.0",
"react": "^17.0.2",
diff --git a/src/App.tsx b/src/App.tsx
index 3e55b86..1db4d41 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -62,7 +62,7 @@ const App: React.FC = () => {
ServerStatus
-
+
{initDone ? (
diff --git a/src/ServerRow.tsx b/src/ServerRow.tsx
index 56c3a87..ff3256a 100644
--- a/src/ServerRow.tsx
+++ b/src/ServerRow.tsx
@@ -4,8 +4,12 @@
import intl from 'react-intl-universal';
import React, { ReactNode } from 'react';
import {
- Row, Col, Tag, Progress, Tooltip, Alert,
+ Row, Col, Progress, Tooltip, Alert,
} from 'antd';
+import {
+ CheckCircleFilled,
+ WarningFilled
+} from '@ant-design/icons';
interface RawData {
name: string;
@@ -33,12 +37,9 @@ interface SergateData {
updated?: string;
}
-const resGutter = {
- xs: 8, sm: 16, md: 24, lg: 32,
-};
-
function onlineTag(online: boolean, label: string): React.ReactElement {
- return {online ? 'O N' : 'OFF'};
+ //return {online ? 'O N' : 'OFF'};
+ return online ? : ;
}
function transUptime(uptime: string): string {
@@ -132,45 +133,45 @@ const ServerRow: React.FC = (props: SergateData) => {
return (
-
+
IPv4
- IPv6
- {intl.get('NAME')}
- {intl.get('TYPE')}
- {intl.get('LOC')}
+ IPv6
+ {intl.get('NAME')}
+ {intl.get('TYPE')}
+ {intl.get('LOC')}
{intl.get('UPTIME')}
{intl.get('LOAD')}
{intl.get('NETWORK')}
{intl.get('CPU')}
{intl.get('RAM')}
- {intl.get('HDD')}
+ {intl.get('HDD')}
{servers && servers.length > 0 ? servers.map((server) => (
-
+
{idx++}
{onlineTag(server.online4, 'IPv4')}
{onlineTag(server.online6, 'IPv6')}
- {server.host || server.name}
- {server.type}
-
+ {server.host || server.name}
+ {server.type}
+
{transUptime(server.uptime)}
- {server.load}
+ {server.load}
{networkUnit(server.network_rx)}
↓ | ↑
{networkUnit(server.network_tx)}
-
+
-
+
-
+
-
+
diff --git a/src/index.css b/src/index.css
index 09713b3..c56fea3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -10,12 +10,15 @@ body {
.sergate {
margin: 16px 0;
}
-.sergate .ant-row-flex {
+.sergate .ant-row {
position: relative;
flex-wrap: nowrap;
}
+.sergate .sg-progress .ant-progress-outer {
+ margin-right: calc(-3em - 8px);
+ padding-right: calc(3em + 8px);
+}
.sr-head {
- font-weight: bold;
padding-top: 8px;
padding-bottom: 8px;
}
@@ -42,6 +45,14 @@ body {
text-align: center;
}
+.sergate .anticon-check-circle {
+ color: #389e0d;
+}
+
+.sergate .anticon-warning {
+ color: #cf1322;
+}
+
.ant-layout .footer {
position: fixed;
bottom: 0;
@@ -73,13 +84,20 @@ body {
.sr-body .ant-col {
font-size: 0.8rem;
}
+ .sergate .ant-tag {
+ margin-right: 0;
+ }
+}
+
+@media (max-width: 900px) {
.sergate .ant-col .ant-progress-outer {
display: none;
}
.sergate .ant-col .ant-progress-text {
margin-left: 0;
}
- .sergate .ant-tag {
- margin-right: 0;
+
+ .sr-head {
+ font-size: 12px;
}
}