Merge pull request #4 from wjy20030407/master

fix: locale ('1 day' doesn't work), mobile style ('name' item size)
pull/5/head
Kairee Wu 6 years ago committed by GitHub
commit c11917cf30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -38,12 +38,12 @@ const resGutter = {
};
function onlineTag(online: boolean, label: string): React.ReactElement {
return <Tag color={online ? '#87d068' : '#f50'}>{online ? 'ON' : 'OFF'}</Tag>;
return <Tag color={online ? '#87d068' : '#f50'}>{online ? 'O N' : 'OFF'}</Tag>;
}
function transUptime(uptime: string): string {
uptime = uptime || '';
return uptime.replace('days', intl.get('DAYS'));
return uptime.replace(/days|day/, intl.get('DAYS'));
}
function networkUnit(network: number): string {
@ -134,10 +134,10 @@ const ServerRow: React.FC<SergateData> = (props: SergateData) => {
<Row className="sr-head" type="flex" justify="space-around" gutter={8}>
<Col xs={3} sm={3} md={1} lg={1}>IPv4</Col>
<Col xs={0} sm={0} md={0} lg={1}>IPv6</Col>
<Col xs={3} sm={3} md={3} lg={2}>{intl.get('NAME')}</Col>
<Col xs={3} sm={3} md={2} lg={2}>{intl.get('TYPE')}</Col>
<Col xs={5} sm={6} md={3} lg={2}>{intl.get('NAME')}</Col>
<Col xs={0} sm={0} md={2} lg={2}>{intl.get('TYPE')}</Col>
<Col xs={3} sm={2} md={2} lg={2}>{intl.get('LOC')}</Col>
<Col xs={3} 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={2}>{intl.get('LOAD')}</Col>
<Col xs={0} sm={0} md={4} lg={3}>{intl.get('NETWORK')}</Col>
<Col xs={3} sm={3} md={3} lg={3}>{intl.get('CPU')}</Col>
@ -148,10 +148,10 @@ const ServerRow: React.FC<SergateData> = (props: SergateData) => {
<Row key={server.host} className="sr-body" type="flex" justify="center" gutter={resGutter}>
<Col xs={3} sm={3} md={1} lg={1}>{onlineTag(server.online4, 'IPv4')}</Col>
<Col xs={0} sm={0} md={0} lg={1}>{onlineTag(server.online6, 'IPv6')}</Col>
<Col xs={3} sm={3} md={3} lg={2}>{server.host || server.name}</Col>
<Col xs={3} sm={3} md={2} lg={2}>{server.type}</Col>
<Col xs={5} sm={6} md={3} lg={2}>{server.host || server.name}</Col>
<Col xs={0} sm={0} md={2} lg={2}>{server.type}</Col>
<Col xs={3} sm={2} md={2} lg={2}><Flag loc={server.location} /></Col>
<Col xs={3} 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={4} lg={3}>
{networkUnit(server.network_rx)}

@ -54,6 +54,9 @@ body {
}
@media (max-width: 768px) {
.logo {
text-align: center;
}
.sr-head {
font-size: 0.8rem;
}

Loading…
Cancel
Save