fix lint

.vscode/settings.json

@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}

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<any, any> {
         <li><Link to='/member/regist' >Member Regist</Link></li>
         <li><Link to='/member/login' >Member Login</Link></li>
 
-
         <li><Link to='/member/result' >MemberRegistResult</Link></li>
         <li><Link to='/member/emailconfirm' >MemberEmailConfirm</Link></li>
         <li><Link to='/agent/waitauth' >WaitForAuth</Link></li>
+        <li><Link to='/agent/waitauthDetail' >WaitForAuthDetail</Link></li>
 
         <li><Link to='/config/sensorconfig' >SensorConfig</Link></li>
         <li><Link to='/prove/download' >ProveDownload</Link></li>
         <li><Link to='/agent/agents' >Agents</Link></li>
         <li><Link to='/agent/agentDetail' >AgentDetail</Link></li>
         <li><Link to='/target/targetList' >TargetList</Link></li>
-        
+
         <Switch>
           <Route exact path='/' component={Main} />
           <Route exact path='/member/regist' component={MemberRegist} />
@@ -45,6 +46,7 @@ export class Routes extends React.Component<any, any> {
           <Route exact path='/member/emailconfirm' component={MemberEmailConfirm} />
 
           <Route exact path='/agent/waitauth' component={WaitForAuth} />
+          <Route exact path='/agent/waitauthDetail' component={WaitForAuthDetail} />
           <Route exact path='/config/sensorconfig' component={SensorConfig} />
           <Route exact path='/prove/download' component={ProveDownload} />
           <Route exact path='/agent/agents' component={Agents} />
@@ -54,7 +56,7 @@ export class Routes extends React.Component<any, any> {
 
           <Route component={NotFound} />
         </Switch>
-        
+
       </div>
     );
   }

src/ts/containers/agent/Agents.tsx

@@ -37,6 +37,9 @@ export class Agents extends React.Component<any, any> {
     }
 
     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<any, any> {
         //     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<any, any> {
 
 
     handleRowSelected = (selectedRows: number[] | string) => {
-        this.props.history.push({
+        this.props.history.push('/agent/agentDetail');
-            pathname : '/agent/agentDetail', 
-            props: { agent : this.state.agents[selectedRows[0]] } 
-        });
     }
 
     render() {

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 { Link, Route, Redirect } from 'react-router-dom';
-import Dialog from 'material-ui/Dialog';
 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<any, any> {
     constructor(props: any, context: any) {
-        super(props, context)
+        super(props, context);
-        this.getList();
+        this.state = {
-    };
+            agents: []
-
-    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"
         };
 
-        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) => {
+    componentDidMount() {
-    //     console.log(e)
+        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.props.history.push('/agent/waitauthDetail');
-        // 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)
     }
 
     render() {
-        const actions = [
+
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Submit"
-                primary={true}
-                disabled={false}
-                onTouchTap={this.handleSubmit}
-            />,
-        ]
         return (
 
             <div>
                 <Table
-                    selectable={this.state.selectable}
+                    selectable={true}
-                    multiSelectable={this.state.multiSelectable}
+                    multiSelectable={false}
-                    /*onCellClick={this.handleCellClick}*/
                     onRowSelection={this.handleRowSelected}
                 >
                     <TableHeader
-                        displaySelectAll={this.state.showCheckboxes}
+                        adjustForCheckbox={false}
-                        adjustForCheckbox={this.state.showCheckboxes}
+                        enableSelectAll={false}
-                        enableSelectAll={this.state.enableSelectAll} >
+                        displaySelectAll={false}>
                         <TableRow>
-                            <TableHeaderColumn colSpan={3} tooltip="Super Header" style={{ textAlign: 'center' }}>
+                            <TableHeaderColumn >API Key</TableHeaderColumn>
-                                Super Header
+                            <TableHeaderColumn >Description</TableHeaderColumn>
-                                </TableHeaderColumn>
+                            <TableHeaderColumn >Status</TableHeaderColumn>
-                        </TableRow>
+                            <TableHeaderColumn >Host</TableHeaderColumn>
-                        <TableRow>
+                            <TableHeaderColumn >Local IP</TableHeaderColumn>
-                            <TableHeaderColumn tooltip="The API Key">API Key</TableHeaderColumn>
+                            <TableHeaderColumn >Date</TableHeaderColumn>
-                            <TableHeaderColumn tooltip="The Name">Name</TableHeaderColumn>
-                            <TableHeaderColumn tooltip="The Status">Status</TableHeaderColumn>
                         </TableRow>
                     </TableHeader>
                     <TableBody
-                        displayRowCheckbox={this.state.showCheckboxes}
+                        displayRowCheckbox={false}
-                        stripedRows={this.state.stripedRows}>
+                    >
-                        {tableData.map((row: any, index: number) => (
+                        {this.state.agents.map((row: any, index: number) => (
                             <TableRow key={index} >
-                                <TableRowColumn>{row.apiKey}</TableRowColumn>
+                                <TableRowColumn>{row.id}</TableRowColumn>
-                                <TableRowColumn>{row.name}</TableRowColumn>
+                                <TableRowColumn>{row.description}</TableRowColumn>
                                 <TableRowColumn>{row.status}</TableRowColumn>
+                                 <TableRowColumn>{row.hostName}</TableRowColumn>
+                                  <TableRowColumn>{row.localIP}</TableRowColumn>
+                                  <TableRowColumn>{row.date}</TableRowColumn>
                             </TableRow>
                         ))};
 
                         </TableBody>
-                    <TableFooter
-                        adjustForCheckbox={this.state.showCheckboxes} >
-                        < Dialog
-                            title="Dialog With Actions"
-                            actions={actions}
-                            modal={true}
-                            open={this.state.open} >
-                            선택한 Agent를 인증하시겠습니까?
-                            </Dialog >
-                    </TableFooter>
                 </Table>
-                <FlatButton
-                    style={{ float: 'right' }}
-                    label="Submit"
-                    primary={true}
-                    onTouchTap={this.handleOpenDialog}
-                />
-                <FlatButton
-                    style={{ float: 'right' }}
-                    label="Cancel"
-                    primary={true}
-                    onTouchTap={this.handleClose}
-                />
             </div>
 
         );
     }
 
-
+}
-}

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<any, any> {
+    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 = [
+            <FlatButton
+                label="Cancel"
+                primary={true}
+                onTouchTap={this.handlePopupClose}
+            />,
+            <FlatButton
+                label="Submit"
+                primary={true}
+                onTouchTap={this.handleSubmitAuth}
+            />,
+        ];
+
+        return (
+
+            <div>
+
+                <RaisedButton label="인증 요청" primary={true} style={{ margin: 12 }} onClick={this.handleRequestAuth} />
+                <RaisedButton label="삭제" secondary={true} style={{ margin: 12 }} onClick={this.handleRequestDelete} />
+
+                <Dialog
+                    title="인증 요청"
+                    actions={actions}
+                    modal={true}
+                    open={this.state.popupOpen}
+                >
+                    Are you sure?
+                </Dialog>
+
+            </div>
+
+        );
+    }
+
+}

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": [

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