feat(ui): add index for each row

pull/8/head
Kairee Wu 5 years ago
parent de2736e2b5
commit 1c0fbfe86e
No known key found for this signature in database
GPG Key ID: E904B5FF4F40BC01

@ -1,23 +0,0 @@
{
"env": {
"es6": true,
"node": true
},
"extends": ["plugin:react/recommended", "airbnb"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"react/jsx-filename-extension": [1, { "extensions": [".ts", ".tsx"] }]
}
}

@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx --no-install commitlint --edit "$1"

22151
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -20,26 +20,27 @@
"url": "https://github.com/krwu/ServerStatus-web.git" "url": "https://github.com/krwu/ServerStatus-web.git"
}, },
"dependencies": { "dependencies": {
"@types/jest": "^24.9.1", "@types/jest": "^26.0.0",
"@types/node": "^12.19.3", "@types/node": "^14.0.0",
"@types/react": "^16.9.55", "@types/react": "^17.0.0",
"@types/react-dom": "^16.9.9", "@types/react-dom": "^17.0.0",
"antd": "^3.26.20", "antd": "^3.26.20",
"babel-plugin-import": "^1.13.1", "babel-plugin-import": "^1.13.1",
"customize-cra": "^0.9.1", "customize-cra": "^1.0.0",
"react": "^16.14.0", "react": "^17.0.0",
"react-app-rewired": "^2.1.6", "react-app-rewired": "^2.1.6",
"react-dom": "^16.14.0", "react-dom": "^17.0.0",
"react-intl-universal": "^2.4.2", "react-intl-universal": "^2.4.2",
"react-scripts": "^3.4.4", "react-scripts": "^4.0.0",
"typescript": "^3.7.5" "typescript": "^4.1.2"
}, },
"scripts": { "scripts": {
"start": "react-app-rewired start", "start": "react-app-rewired start",
"build": "react-app-rewired build", "build": "react-app-rewired build",
"test": "react-app-rewired test", "test": "react-app-rewired test",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"cz": "git-cz" "cz": "git-cz",
"prepare": "husky install"
}, },
"eslintConfig": { "eslintConfig": {
"extends": "react-app" "extends": "react-app"
@ -57,24 +58,12 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^8.3.5", "@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^8.3.4", "@commitlint/config-conventional": "^13.1.0",
"@semantic-release/changelog": "^3.0.4", "@semantic-release/changelog": "^6.0.0",
"@semantic-release/git": "^7.0.16", "@semantic-release/git": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^2.34.0", "semantic-release": "^18.0.0",
"@typescript-eslint/parser": "^2.34.0", "husky": "^7.0.0"
"eslint": "^6.8.0", "semantic-release": "^15.13.24"
"eslint-config-airbnb": "^18.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^2.5.1",
"husky": "^4.3.0",
"semantic-release": "^17.2.3"
},
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
} }
} }

@ -128,6 +128,7 @@ const ServerRow: React.FC<SergateData> = (props: SergateData) => {
updated = updated || '0'; updated = updated || '0';
const updatedInt = parseInt(updated, 10) * 1000; const updatedInt = parseInt(updated, 10) * 1000;
const updatedTime = formatDateTime(new Date(updatedInt)); const updatedTime = formatDateTime(new Date(updatedInt));
let idx = 1;
return ( return (
<div className="sergate"> <div className="sergate">
@ -136,24 +137,25 @@ const ServerRow: React.FC<SergateData> = (props: SergateData) => {
<Col xs={0} sm={0} md={0} lg={1}>IPv6</Col> <Col xs={0} sm={0} md={0} lg={1}>IPv6</Col>
<Col xs={5} sm={6} md={3} lg={2}>{intl.get('NAME')}</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={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={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={2}>{intl.get('LOAD')}</Col> <Col xs={0} sm={0} md={0} lg={1}>{intl.get('LOAD')}</Col>
<Col xs={0} sm={0} md={4} lg={3}>{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={3} 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" type="flex" justify="center" gutter={resGutter}>
<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={0} 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={6} md={3} lg={2}>{server.host || server.name}</Col>
<Col xs={0} sm={0} md={2} lg={2}>{server.type}</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={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={2}>{server.load}</Col>
<Col xs={0} sm={0} md={4} lg={3}> <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)}

@ -1,7 +1,6 @@
body { body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei',
'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
'Segoe UI Emoji', 'Segoe UI Symbol';
} }
.logo { .logo {
color: #fff; color: #fff;
@ -11,7 +10,10 @@ body {
.sergate { .sergate {
margin: 16px 0; margin: 16px 0;
} }
.sergate .ant-row-flex {
position: relative;
flex-wrap: nowrap;
}
.sr-head { .sr-head {
font-weight: bold; font-weight: bold;
padding-top: 8px; padding-top: 8px;
@ -26,6 +28,14 @@ body {
padding-bottom: 8px; padding-bottom: 8px;
border-top: 1px solid #ebebeb; border-top: 1px solid #ebebeb;
} }
.col-num {
position: absolute;
width: 16px;
line-height: 40px;
left: -16px;
top: 0;
text-align: right;
}
.sergate .lastUpdated { .sergate .lastUpdated {
margin-top: 16px; margin-top: 16px;
@ -70,6 +80,6 @@ body {
margin-left: 0; margin-left: 0;
} }
.sergate .ant-tag { .sergate .ant-tag {
margin-right:0; margin-right: 0;
} }
} }

@ -17,7 +17,8 @@
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react" "jsx": "react-jsx",
"noFallthroughCasesInSwitch": true
}, },
"include": [ "include": [
"src" "src"

14711
yarn.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save