From 4aeeeb7245b88f322c395a78c2007fa909d9ea4a Mon Sep 17 00:00:00 2001 From: Kairee Wu Date: Tue, 5 May 2020 14:12:41 +0800 Subject: [PATCH] style: fix eslint style issues --- .eslintrc.json | 47 +++++------- src/ServerRow.tsx | 192 ++++++++++++++++++++++++++-------------------- 2 files changed, 131 insertions(+), 108 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 15bd28b..b08e23f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,28 +1,23 @@ { - "env": { - "es6": true, - "node": true + "env": { + "es6": true, + "node": true + }, + "extends": ["plugin:react/recommended", "airbnb"], + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaFeatures": { + "jsx": 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": { - } -} \ No newline at end of file + "ecmaVersion": 2018, + "sourceType": "module" + }, + "plugins": ["react", "@typescript-eslint"], + "rules": { + "react/jsx-filename-extension": [1, { "extensions": [".ts", ".tsx"] }] + } +} diff --git a/src/ServerRow.tsx b/src/ServerRow.tsx index 4eaad1c..ae1f79a 100644 --- a/src/ServerRow.tsx +++ b/src/ServerRow.tsx @@ -1,6 +1,11 @@ +/* eslint-disable no-param-reassign */ +/* eslint-disable no-unused-vars */ +/* eslint-disable camelcase */ import intl from 'react-intl-universal'; import React, { ReactNode } from 'react'; -import { Row, Col, Tag, Progress, Tooltip, Alert } from 'antd'; +import { + Row, Col, Tag, Progress, Tooltip, Alert, +} from 'antd'; interface RawData { name: string; @@ -28,10 +33,12 @@ interface SergateData { updated?: string; } -const resGutter = { xs: 8, sm: 16, md: 24, lg: 32 }; +const resGutter = { + xs: 8, sm: 16, md: 24, lg: 32, +}; function onlineTag(online: boolean, label: string): React.ReactElement { - return { online ? 'ON' : 'OFF' } + return {online ? 'ON' : 'OFF'}; } function transUptime(uptime: string): string { @@ -42,119 +49,140 @@ function transUptime(uptime: string): string { function networkUnit(network: number): string { network = network || 0; if (network < 1000) { - return network.toFixed(0) + 'B'; - } else if (network < 1000*1000) { - return (network / 1000).toFixed(0) + 'K'; - } else { - return (network / 1000 / 1000).toFixed(0) + 'M'; + return `${network.toFixed(0)}B`; + } if (network < 1000 * 1000) { + return `${(network / 1000).toFixed(0)}K`; } + return `${(network / 1000 / 1000).toFixed(0)}M`; } function bytesToSize(bytes: number, precision: number = 1, si: number = 0) { - const kilobyte = si === 0 ? 1024 : 1000; const megabyte = kilobyte * kilobyte; - const gigabyte = megabyte * kilobyte; + const gigabyte = megabyte * kilobyte; const terabyte = gigabyte * kilobyte; bytes = bytes || 0; - bytes *= 1024 - if ( bytes >= 0 && bytes < kilobyte) { - return bytes + 'B'; + bytes *= 1024; + if (bytes >= 0 && bytes < kilobyte) { + return `${bytes}B`; } if (bytes >= kilobyte && bytes < megabyte) { - return (bytes / kilobyte).toFixed(precision) + 'K'; + return `${(bytes / kilobyte).toFixed(precision)}K`; } if (bytes >= megabyte && bytes < gigabyte) { - return (bytes / megabyte).toFixed(precision) + 'M'; + return `${(bytes / megabyte).toFixed(precision)}M`; } if (bytes >= gigabyte && bytes < terabyte) { - return (bytes / gigabyte).toFixed(precision) + 'G'; + return `${(bytes / gigabyte).toFixed(precision)}G`; } - return (bytes / terabyte).toFixed(precision) + 'T'; + return `${(bytes / terabyte).toFixed(precision)}T`; } function memTips(props: RawData): ReactNode { - const { memory_used, memory_total, swap_used, swap_total } = props; - return (
-
Mem:
-
{bytesToSize(memory_used)}/{bytesToSize(memory_total)}
-
Swap:
-
{bytesToSize(swap_used)}/{bytesToSize(swap_total)}
-
); + const { + memory_used, memory_total, swap_used, swap_total, + } = props; + return ( +
+
Mem:
+
+ {bytesToSize(memory_used)} + / + {bytesToSize(memory_total)} +
+
Swap:
+
+ {bytesToSize(swap_used)} + / + {bytesToSize(swap_total)} +
+
+ ); } function formatDateTime(time: Date) { const year = time.getFullYear(); - const month = ((time.getMonth() + 1) + '').padStart(2, '0'); - const day = (time.getDate() + '').padStart(2, '0'); - const hour = (time.getHours() + '').padStart(2, '0'); - const minute = (time.getMinutes() + '').padStart(2, '0'); - const second = (time.getSeconds() + '').padStart(2, '0'); + const month = (`${time.getMonth() + 1}`).padStart(2, '0'); + const day = (`${time.getDate()}`).padStart(2, '0'); + const hour = (`${time.getHours()}`).padStart(2, '0'); + const minute = (`${time.getMinutes()}`).padStart(2, '0'); + const second = (`${time.getSeconds()}`).padStart(2, '0'); return `${year}-${month}-${day} ${hour}:${minute}:${second}`; } -const Flag: React.FC<{ loc: string}> = ({ loc }) => ( - -) +interface FlagProps { + loc: string +} +const Flag: React.FC = ({ loc }: FlagProps) => ( + +); -const ServerRow: React.FC = (props) => { +const ServerRow: React.FC = (props: SergateData) => { let { servers, updated } = props; servers = servers || []; updated = updated || '0'; - let updatedInt = parseInt(updated) * 1000; - let updatedTime = formatDateTime(new Date(updatedInt)); - - return (
- - IPv4 - 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')} - - {servers && servers.length > 0 ? servers.map(server => ( - - { onlineTag(server.online4, 'IPv4') } - { onlineTag(server.online6, 'IPv6') } - { server.host || server.name } - { server.type } - - { transUptime(server.uptime) } - { server.load } - { networkUnit(server.network_rx) }↓ | ↑{ networkUnit(server.network_tx)} - - - - - - - - - - - - - + const updatedInt = parseInt(updated, 10) * 1000; + const updatedTime = formatDateTime(new Date(updatedInt)); + + return ( +
+ + IPv4 + 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')} - )) : } - {updatedInt > 0 && } -
) - }; + {servers && servers.length > 0 ? servers.map((server) => ( + + {onlineTag(server.online4, 'IPv4')} + {onlineTag(server.online6, 'IPv6')} + {server.host || server.name} + {server.type} + + {transUptime(server.uptime)} + {server.load} + + {networkUnit(server.network_rx)} + ↓ | ↑ + {networkUnit(server.network_tx)} + + + + + + + + + + + + + + + + )) : ( + + )} + {updatedInt > 0 && } +
+ ); +}; export default ServerRow;