Chore: modify styles & add tslint preloader

configs/webpack/common.js

@@ -17,6 +17,11 @@ module.exports = {
     context: resolve(__dirname, '../../src'),
     module: {
         rules: [
+            {
+                test: /\.tsx?$/,
+                enforce: 'pre',
+                use: ['tslint-loader']
+            },
             {
                 test: /\.js$/,
                 use: ['babel-loader', 'source-map-loader'],

package.json

@@ -53,6 +53,7 @@
         "stylelint-webpack-plugin": "^0.10.5",
         "tslint": "^5.11.0",
         "tslint-config-standard": "^8.0.1",
+        "tslint-loader": "^3.6.0",
         "uglifyjs-webpack-plugin": "^2.0.1",
         "webpack": "^4.19.1",
         "webpack-cli": "^3.1.1",

src/components/Input/index.tsx

@@ -16,7 +16,7 @@ export class Input extends React.Component<InputProps, {}> {
         onChange: () => {}
     }
 
-    render() {
+    render () {
         const { onChange, value } = this.props
         return (
             <input className="input" onChange={(event) => {
@@ -24,4 +24,4 @@ export class Input extends React.Component<InputProps, {}> {
             }} value={value} ></input>
         )
     }
-}
+}

src/components/Input/style.scss

@@ -16,6 +16,6 @@
     &:focus {
         outline: 0;
         border-color: $color-primary;
-        box-shadow: 0 2px 10px rgba($color: $color-primary, $alpha: 0.5);
+        box-shadow: 0 2px 5px rgba($color: $color-primary, $alpha: 0.5);
     }
 }

src/containers/Settings/index.tsx

@@ -12,7 +12,7 @@ class Settings extends React.Component<I18nProps, {}> {
         setAsSystemProxy: true,
         allowConnectFromLan: true,
         proxyMode: 'rule',
-        socketProxyPort: 7891,
+        socks5ProxyPort: 7891,
         httpProxyPort: 7890,
         externalController: '127.0.0.1:7892'
     }
@@ -36,9 +36,9 @@ class Settings extends React.Component<I18nProps, {}> {
             setAsSystemProxy,
             allowConnectFromLan,
             proxyMode,
-            socketProxyPort,
+            socks5ProxyPort,
             httpProxyPort,
-            externalController,
+            externalController
         } = this.state
 
         return (
@@ -99,11 +99,11 @@ class Settings extends React.Component<I18nProps, {}> {
                                 onSelect={proxyMode => this.setState({ proxyMode })}
                             />
                         </Col>
-                        <Col span={4} offset={1}>
-                            <span className="label">{t('labels.socketProxyPort')}</span>
+                        <Col span={5} offset={1}>
+                            <span className="label">{t('labels.socks5ProxyPort')}</span>
                         </Col>
-                        <Col span={3} offset={4}>
-                            <Input value={socketProxyPort} onChange={socketProxyPort => this.setState({socketProxyPort})}></Input>
+                        <Col span={3} offset={3}>
+                            <Input value={socks5ProxyPort} onChange={socks5ProxyPort => this.setState({ socks5ProxyPort })}></Input>
                         </Col>
                     </Row>
                     <Row gutter={24} align="middle">
@@ -111,7 +111,7 @@ class Settings extends React.Component<I18nProps, {}> {
                             <span className="label">{t('labels.httpProxyPort')}</span>
                         </Col>
                         <Col span={3} offset={3}>
-                            <Input value={httpProxyPort} onChange={httpProxyPort => this.setState({httpProxyPort})}></Input>
+                            <Input value={httpProxyPort} onChange={httpProxyPort => this.setState({ httpProxyPort })}></Input>
                         </Col>
                         <Col span={4} offset={1}>
                             <span className="label">{t('labels.externalController')}</span>

src/i18n/en_US.ts

@@ -14,7 +14,7 @@ export default {
             setAsSystemProxy: 'Set as system proxy',
             allowConnectFromLan: 'Allow connect from Lan',
             proxyMode: 'Mode',
-            socketProxyPort: 'Socket proxy port',
+            socks5ProxyPort: 'Socks5 proxy port',
             httpProxyPort: 'HTTP proxy port',
             externalController: 'External controller'
         },

src/i18n/zh_CN.ts

@@ -14,7 +14,7 @@ export default {
             setAsSystemProxy: '设置为系统代理',
             allowConnectFromLan: '允许来自局域网的连接',
             proxyMode: '代理模式',
-            socketProxyPort: 'Socket 代理端口',
+            socks5ProxyPort: 'Socks5 代理端口',
             httpProxyPort: 'HTTP 代理端口',
             externalController: '外部控制设置'
         },

src/index.ts

@@ -27,5 +27,5 @@ OfflinePluginRuntime.install({
 
     onUpdateFailed: () => {
         console.error('SW Event:', 'onUpdateFailed')
-    },
+    }
 })