feat: bump antd version to 4.0

pull/8/head
Kairee Wu 5 years ago
parent 576ae9734c
commit 664003df1b
No known key found for this signature in database
GPG Key ID: E904B5FF4F40BC01

@ -20,6 +20,7 @@
"url": "https://github.com/krwu/ServerStatus-web.git" "url": "https://github.com/krwu/ServerStatus-web.git"
}, },
"dependencies": { "dependencies": {
"@ant-design/icons": "^4.6.4",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",
@ -27,7 +28,7 @@
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"@types/react": "^17.0.0", "@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.0",
"antd": "^3.26.20", "antd": "^4.0.0",
"babel-plugin-import": "^1.13.1", "babel-plugin-import": "^1.13.1",
"customize-cra": "^1.0.0", "customize-cra": "^1.0.0",
"react": "^17.0.2", "react": "^17.0.2",

@ -62,7 +62,7 @@ const App: React.FC = () => {
<div className="logo">ServerStatus</div> <div className="logo">ServerStatus</div>
</Header> </Header>
<Content style={{ background: "#fff" }}> <Content style={{ background: "#fff" }}>
<Row type="flex" justify="center"> <Row justify="center">
<Col xs={24} sm={23} md={23} lg={22} xl={20} xxl={16}> <Col xs={24} sm={23} md={23} lg={22} xl={20} xxl={16}>
{initDone ? ( {initDone ? (
<Spin size="large" spinning={!isOnline} tip="Loading..."> <Spin size="large" spinning={!isOnline} tip="Loading...">

@ -4,8 +4,12 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import React, { ReactNode } from 'react'; import React, { ReactNode } from 'react';
import { import {
Row, Col, Tag, Progress, Tooltip, Alert, Row, Col, Progress, Tooltip, Alert,
} from 'antd'; } from 'antd';
import {
CheckCircleFilled,
WarningFilled
} from '@ant-design/icons';
interface RawData { interface RawData {
name: string; name: string;
@ -33,12 +37,9 @@ interface SergateData {
updated?: string; updated?: string;
} }
const resGutter = {
xs: 8, sm: 16, md: 24, lg: 32,
};
function onlineTag(online: boolean, label: string): React.ReactElement { function onlineTag(online: boolean, label: string): React.ReactElement {
return <Tag color={online ? '#87d068' : '#f50'}>{online ? 'O N' : 'OFF'}</Tag>; //return <Tag color={online ? '#87d068' : '#f50'}>{online ? 'O N' : 'OFF'}</Tag>;
return online ? <CheckCircleFilled /> : <WarningFilled />;
} }
function transUptime(uptime: string): string { function transUptime(uptime: string): string {
@ -132,45 +133,45 @@ const ServerRow: React.FC<SergateData> = (props: SergateData) => {
return ( return (
<div className="sergate"> <div className="sergate">
<Row className="sr-head" type="flex" justify="space-around" gutter={8}> <Row className="sr-head" justify="space-around" gutter={10}>
<Col xs={3} sm={3} md={1} lg={1}>IPv4</Col> <Col xs={3} sm={3} md={1} lg={1}>IPv4</Col>
<Col xs={0} sm={0} md={0} lg={1}>IPv6</Col> <Col xs={0} sm={0} md={1} lg={1}>IPv6</Col>
<Col xs={5} sm={6} md={3} lg={2}>{intl.get('NAME')}</Col> <Col xs={5} sm={4} md={2} lg={2}>{intl.get('NAME')}</Col>
<Col xs={0} sm={0} md={2} lg={2}>{intl.get('TYPE')}</Col> <Col xs={0} sm={2} md={2} lg={2}>{intl.get('TYPE')}</Col>
<Col xs={3} sm={2} md={1} lg={1}>{intl.get('LOC')}</Col> <Col xs={2} sm={2} md={1} lg={1}>{intl.get('LOC')}</Col>
<Col xs={4} sm={4} md={3} lg={2}>{intl.get('UPTIME')}</Col> <Col xs={4} sm={4} md={3} lg={2}>{intl.get('UPTIME')}</Col>
<Col xs={0} sm={0} md={0} lg={1}>{intl.get('LOAD')}</Col> <Col xs={0} sm={0} md={0} lg={1}>{intl.get('LOAD')}</Col>
<Col xs={0} sm={0} md={5} lg={4}>{intl.get('NETWORK')}</Col> <Col xs={0} sm={0} md={5} lg={4}>{intl.get('NETWORK')}</Col>
<Col xs={3} sm={3} md={3} lg={3}>{intl.get('CPU')}</Col> <Col xs={3} sm={3} md={3} lg={3}>{intl.get('CPU')}</Col>
<Col xs={3} sm={3} md={3} lg={3}>{intl.get('RAM')}</Col> <Col xs={3} sm={3} md={3} lg={3}>{intl.get('RAM')}</Col>
<Col xs={3} sm={3} md={3} lg={3}>{intl.get('HDD')}</Col> <Col xs={4} sm={3} md={3} lg={3}>{intl.get('HDD')}</Col>
</Row> </Row>
{servers && servers.length > 0 ? servers.map((server) => ( {servers && servers.length > 0 ? servers.map((server) => (
<Row key={server.host} className="sr-body" type="flex" justify="center" gutter={resGutter}> <Row key={server.host} className="sr-body" justify="space-around" gutter={10}>
<span className="col-num">{idx++}</span> <span className="col-num">{idx++}</span>
<Col xs={3} sm={3} md={1} lg={1}>{onlineTag(server.online4, 'IPv4')}</Col> <Col xs={3} sm={3} md={1} lg={1}>{onlineTag(server.online4, 'IPv4')}</Col>
<Col xs={0} sm={0} md={1} lg={1}>{onlineTag(server.online6, 'IPv6')}</Col> <Col xs={0} sm={0} md={1} lg={1}>{onlineTag(server.online6, 'IPv6')}</Col>
<Col xs={5} sm={6} md={3} lg={2}>{server.host || server.name}</Col> <Col xs={5} sm={4} md={2} lg={2}>{server.host || server.name}</Col>
<Col xs={0} sm={0} md={2} lg={2}>{server.type}</Col> <Col xs={0} sm={2} md={2} lg={2}>{server.type}</Col>
<Col xs={3} sm={2} md={1} lg={1}><Flag loc={server.location} /></Col> <Col xs={2} sm={2} md={1} lg={1}><Flag loc={server.location} /></Col>
<Col xs={4} sm={4} md={3} lg={2}>{transUptime(server.uptime)}</Col> <Col xs={4} sm={4} md={3} lg={2}>{transUptime(server.uptime)}</Col>
<Col xs={0} sm={0} md={0} lg={2}>{server.load}</Col> <Col xs={0} sm={0} md={0} lg={1}>{server.load}</Col>
<Col xs={0} sm={0} md={5} lg={4}> <Col xs={0} sm={0} md={5} lg={4}>
{networkUnit(server.network_rx)} {networkUnit(server.network_rx)}
↓ | ↑ ↓ | ↑
{networkUnit(server.network_tx)} {networkUnit(server.network_tx)}
</Col> </Col>
<Col xs={3} sm={3} md={3} lg={3}> <Col xs={3} sm={3} md={3} lg={3}>
<Progress strokeWidth={12} percent={server.cpu} status="active" /> <Progress className="sg-progress" strokeLinecap="square" strokeWidth={12} percent={server.cpu} status="active" />
</Col> </Col>
<Col xs={3} sm={3} md={3} lg={3}> <Col xs={3} sm={3} md={3} lg={3}>
<Tooltip placement="left" title={memTips(server)}> <Tooltip placement="left" title={memTips(server)}>
<Progress strokeWidth={12} percent={parseFloat(((server.memory_used / server.memory_total) * 100).toFixed(1))} status="active" /> <Progress className="sg-progress" strokeLinecap="square" strokeWidth={12} percent={parseFloat(((server.memory_used / server.memory_total) * 100).toFixed(1))} status="active" />
</Tooltip> </Tooltip>
</Col> </Col>
<Col xs={3} sm={3} md={3} lg={3}> <Col xs={4} sm={3} md={3} lg={3}>
<Tooltip placement="left" title={`${bytesToSize(server.hdd_used * 1024)}/${bytesToSize(server.hdd_total * 1024)}`}> <Tooltip placement="left" title={`${bytesToSize(server.hdd_used * 1024)}/${bytesToSize(server.hdd_total * 1024)}`}>
<Progress strokeWidth={12} percent={parseFloat(((server.hdd_used / server.hdd_total) * 100).toFixed(1))} status="active" /> <Progress className="sg-progress" strokeLinecap="square" strokeWidth={12} percent={parseFloat(((server.hdd_used / server.hdd_total) * 100).toFixed(1))} status="active" />
</Tooltip> </Tooltip>
</Col> </Col>
</Row> </Row>

@ -10,12 +10,15 @@ body {
.sergate { .sergate {
margin: 16px 0; margin: 16px 0;
} }
.sergate .ant-row-flex { .sergate .ant-row {
position: relative; position: relative;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.sergate .sg-progress .ant-progress-outer {
margin-right: calc(-3em - 8px);
padding-right: calc(3em + 8px);
}
.sr-head { .sr-head {
font-weight: bold;
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
} }
@ -42,6 +45,14 @@ body {
text-align: center; text-align: center;
} }
.sergate .anticon-check-circle {
color: #389e0d;
}
.sergate .anticon-warning {
color: #cf1322;
}
.ant-layout .footer { .ant-layout .footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -73,13 +84,20 @@ body {
.sr-body .ant-col { .sr-body .ant-col {
font-size: 0.8rem; font-size: 0.8rem;
} }
.sergate .ant-tag {
margin-right: 0;
}
}
@media (max-width: 900px) {
.sergate .ant-col .ant-progress-outer { .sergate .ant-col .ant-progress-outer {
display: none; display: none;
} }
.sergate .ant-col .ant-progress-text { .sergate .ant-col .ant-progress-text {
margin-left: 0; margin-left: 0;
} }
.sergate .ant-tag {
margin-right: 0; .sr-head {
font-size: 12px;
} }
} }

Loading…
Cancel
Save