From c3fbd8ae1ff3af54a1d01e80f0b8653675af1697 Mon Sep 17 00:00:00 2001 From: insanity Date: Tue, 6 Jun 2017 16:16:05 +0900 Subject: [PATCH] fix lint --- .vscode/settings.json | 3 + src/ts/Routes.tsx | 22 +- src/ts/containers/agent/Agents.tsx | 10 +- src/ts/containers/agent/WaitForAuth.tsx | 200 +++++------------- src/ts/containers/agent/WaitForAuthDetail.tsx | 94 ++++++++ tslint.json | 8 + webpack.config.js | 2 +- 7 files changed, 178 insertions(+), 161 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/ts/containers/agent/WaitForAuthDetail.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..20af2f6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +// Place your settings in this file to overwrite default and user settings. +{ +} \ No newline at end of file diff --git a/src/ts/Routes.tsx b/src/ts/Routes.tsx index f9ba64d..8579da9 100644 --- a/src/ts/Routes.tsx +++ b/src/ts/Routes.tsx @@ -3,17 +3,18 @@ import { Switch } from 'react-router'; import { Link, Route } from 'react-router-dom'; import { Main } from './containers/Main'; -import { Regist as MemberRegist } from './containers/member/Regist'; import { Login as MemberLogin } from './containers/member/Login'; +import { Regist as MemberRegist } from './containers/member/Regist'; import NotFound from './NotFound'; -import { ProveDownload } from './containers/prove/Download'; -import { SensorConfig } from './containers/config/SensorConfig'; -import { WaitForAuth } from './containers/agent/WaitForAuth'; -import { MemberRegistResult } from './containers/member/RegistResult'; -import { MemberEmailConfirm } from './containers/member/EmailConfirm'; -import { Agents } from './containers/agent/Agents'; import { AgentDetail } from './containers/agent/AgentDetail'; +import { Agents } from './containers/agent/Agents'; +import { WaitForAuth } from './containers/agent/WaitForAuth'; +import { WaitForAuthDetail } from './containers/agent/WaitForAuthDetail'; +import { SensorConfig } from './containers/config/SensorConfig'; +import { MemberEmailConfirm } from './containers/member/EmailConfirm'; +import { MemberRegistResult } from './containers/member/RegistResult'; +import { ProveDownload } from './containers/prove/Download'; import { TargetList } from './containers/target/TargetList'; @@ -26,17 +27,17 @@ export class Routes extends React.Component {
  • Member Regist
  • Member Login
    • -
  • MemberRegistResult
  • MemberEmailConfirm
  • WaitForAuth
    • +
  • WaitForAuthDetail
  • SensorConfig
  • ProveDownload
  • Agents
  • AgentDetail
  • TargetList
    • - + @@ -45,6 +46,7 @@ export class Routes extends React.Component { + @@ -54,7 +56,7 @@ export class Routes extends React.Component { - + ); } diff --git a/src/ts/containers/agent/Agents.tsx b/src/ts/containers/agent/Agents.tsx index 44840d4..f8398d5 100644 --- a/src/ts/containers/agent/Agents.tsx +++ b/src/ts/containers/agent/Agents.tsx @@ -37,6 +37,9 @@ export class Agents extends React.Component { } getAgents = () => { + + var val = '[{"id":3,"member":{"id":1,"email":"insanity33@loafle.com","pwSalt":"salktttt","digest":"bbbbbbbbb","name":"insanity3","company":"loafle","phone":"000-000-0000","authorizedDate":null},"authorizedDate":null,"description":"test agent2"},{"id":4,"member":{"id":1,"email":"","pwSalt":"","digest":"","name":"","company":"","phone":"","authorizedDate":0},"authorizedDate":null,"description":"test agent3"}]'; + // let output: string; // let obj: any; //new object declaration // obj = { @@ -53,7 +56,7 @@ export class Agents extends React.Component { // console.log(err); // }); - var val = '[{"id":3,"member":{"id":1,"email":"insanity33@loafle.com","pwSalt":"salktttt","digest":"bbbbbbbbb","name":"insanity3","company":"loafle","phone":"000-000-0000","authorizedDate":null},"authorizedDate":null,"description":"test agent2"},{"id":4,"member":{"id":1,"email":"","pwSalt":"","digest":"","name":"","company":"","phone":"","authorizedDate":0},"authorizedDate":null,"description":"test agent3"}]'; + this.setState({ agents : JSON.parse(val) }); @@ -61,10 +64,7 @@ export class Agents extends React.Component { handleRowSelected = (selectedRows: number[] | string) => { - this.props.history.push({ - pathname : '/agent/agentDetail', - props: { agent : this.state.agents[selectedRows[0]] } - }); + this.props.history.push('/agent/agentDetail'); } render() { diff --git a/src/ts/containers/agent/WaitForAuth.tsx b/src/ts/containers/agent/WaitForAuth.tsx index fc63bb9..fcda406 100644 --- a/src/ts/containers/agent/WaitForAuth.tsx +++ b/src/ts/containers/agent/WaitForAuth.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import { Table, TableBody, @@ -9,9 +8,8 @@ import { TableRow, TableRowColumn, } from 'material-ui/Table'; -import Toggle from 'material-ui/Toggle'; -import FlatButton from 'material-ui/FlatButton'; -import Dialog from 'material-ui/Dialog'; + +import { Link, Route, Redirect } from 'react-router-dom'; import { OFRest } from '../../components/Rest'; const styles = { @@ -25,179 +23,91 @@ const styles = { }, }; -const tableData = [ - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 1', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 2', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 3', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 4', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 5', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 6', - status: 'Wait For Auth', - }, - { - apiKey: 'wqekoekeeeeerw', - name: 'Agent 7', - status: 'Wait For Auth', - }, -]; export class WaitForAuth extends React.Component { constructor(props: any, context: any) { - super(props, context) - this.getList(); - }; - - state = { - selectable: true, - multiSelectable: true, - enableSelectAll: true, - showCheckboxes: true, - stripedRows: false, - open: false, - }; - - sselectedRows: number[] | string; - - getList = () => { - let output: string; - let obj: any; //new object declaration - obj = { - "authStatus": "ACCEPT" + super(props, context); + this.state = { + agents: [] }; - let os: OFRest = new OFRest("NoauthAgent", "GetNoAuthList", obj); - - os.Call().then(function (res) { - return res.json(); - }).then(function (json) { - console.log(json); - }).catch(function (err) { - console.log(err); - }); }; - // handleCellClick = (e: any, idx: number) => { - // console.log(e) - // } + componentDidMount() { + this.getAgents(); + } + + getAgents = () => { + + // var val = '[{"id":3,"member":{"id":1,"email":"insanity33@loafle.com","pwSalt":"salktttt","digest":"bbbbbbbbb","name":"insanity3","company":"loafle","phone":"000-000-0000","authorizedDate":null},"authorizedDate":null,"description":"test agent2"},{"id":4,"member":{"id":1,"email":"","pwSalt":"","digest":"","name":"","company":"","phone":"","authorizedDate":0},"authorizedDate":null,"description":"test agent3"}]'; + + // let output: string; + // let obj: any; //new object declaration + // obj = { + // "authStatus":"ACCEPT" + // }; + + // let os: OFRest = new OFRest("NoauthAgent", "GetNoAuthList", obj); + + // os.Call().then(function (res) { + // return res.json(); + // }).then(function (json) { + // console.log(json); + // }).catch(function (err) { + // console.log(err); + // }); + + // this.setState({ + // agents : JSON.parse(val) + // }); + } handleRowSelected = (selectedRows: number[] | string) => { - // console.log(selectedRows) - // this.setState({ open: true }) - this.sselectedRows = selectedRows; - } - - handleClose = () => { - this.setState({ open: false }); - }; - - handleOpenDialog = () => { - this.setState({ open: true }) - // console.log(this.sselectedRows) - } - - handleSubmit = () => { - console.log("Agent Auth Service Request: " + this.sselectedRows) + this.props.history.push('/agent/waitauthDetail'); } render() { - const actions = [ - , - , - ] + return (
    + adjustForCheckbox={false} + enableSelectAll={false} + displaySelectAll={false}> - - Super Header - - - - API Key - Name - Status + API Key + Description + Status + Host + Local IP + Date - {tableData.map((row: any, index: number) => ( + displayRowCheckbox={false} + > + {this.state.agents.map((row: any, index: number) => ( - {row.apiKey} - {row.name} + {row.id} + {row.description} {row.status} + {row.hostName} + {row.localIP} + {row.date} ))}; - - < Dialog - title="Dialog With Actions" - actions={actions} - modal={true} - open={this.state.open} > - 선택한 Agent를 인증하시겠습니까? - -
    - -
    ); } - -} \ No newline at end of file +} diff --git a/src/ts/containers/agent/WaitForAuthDetail.tsx b/src/ts/containers/agent/WaitForAuthDetail.tsx new file mode 100644 index 0000000..d9fdb8b --- /dev/null +++ b/src/ts/containers/agent/WaitForAuthDetail.tsx @@ -0,0 +1,94 @@ +import Dialog from 'material-ui/Dialog'; +import FlatButton from 'material-ui/FlatButton'; +import RaisedButton from 'material-ui/RaisedButton'; +import * as React from 'react'; +import { OFRest } from '../../components/Rest'; + +const styles = { + headline: { + fontSize: 24, + paddingTop: 16, + marginBottom: 12, + fontWeight: 400, + }, +}; + +export class WaitForAuthDetail extends React.Component { + constructor(props: any, context: any) { + super(props, context); + this.state = { + agent: null, + popupOpen: false, + }; + } + + handleRequestAuth = () => { + this.setState({ + popupOpen: true, + }); + } + + handleRequestDelete = () => { + alert("delete"); + this.props.history.go(-1); + } + + handlePopupClose = () => { + this.setState({ popupOpen: false }); + } + + handleSubmitAuth = () => { + + let output: string; + let obj: any; // new object declaration + obj = { + + }; + + const os: OFRest = new OFRest("NoauthAgent", "Regist", obj); + + os.Call().then(function(res) { + return res.json(); + }).then(function(json) { + console.log(json); + }).catch(function(err) { + console.log(err); + }); + } + + render() { + const actions = [ + , + , + ]; + + return ( + +
    + + + + + + Are you sure? + + +
    + + ); + } + +} diff --git a/tslint.json b/tslint.json index bd1e076..9530e59 100644 --- a/tslint.json +++ b/tslint.json @@ -1,4 +1,5 @@ { + "extends": "tslint:recommended", "rules": { "indent": [ true, @@ -8,8 +9,15 @@ "quotemark": [ "single" ], + "only-arrow-functions": [ + false, "allow-declarations", "allow-named-functions" + ], + "no-console": false, + "prefer-const": false, + "member-access": false, "no-unused-expression": true, "no-duplicate-variable": true, + "object-literal-sort-keys" : false, "curly": true, "class-name": true, "triple-equals": [ diff --git a/webpack.config.js b/webpack.config.js index 3a72835..8d1f2dc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -25,7 +25,7 @@ module.exports = { historyApiFallback: true, contentBase: [__dirname + '/public', __dirname + '/dist', __dirname + '/node_modules'], // match the output path publicPath: '/' ,// match the output `publicPath` - host: '192.168.1.209', + host: '192.168.1.105', port: 9091, stats: { colors: true