diff --git a/src/ts/App.tsx b/src/ts/App.tsx index 9f1c9ab..b20a867 100644 --- a/src/ts/App.tsx +++ b/src/ts/App.tsx @@ -29,6 +29,7 @@ export class App extends React.Component { super(props, context); } + render() { return ( diff --git a/src/ts/components/Rest.tsx b/src/ts/components/Rest.tsx index bd3a6d8..d8bb548 100644 --- a/src/ts/components/Rest.tsx +++ b/src/ts/components/Rest.tsx @@ -21,13 +21,19 @@ export class OFRest { } public Call() { + + let m :any; + m = { + "model" : this.obj + } + return fetch(url, { method: 'POST', headers: { 'Accept': 'application/json', // mode: 'no-cors' }, - body: JSON.stringify(this.obj) + body: JSON.stringify(m) }) } diff --git a/src/ts/containers/member/Regist.tsx b/src/ts/containers/member/Regist.tsx index 721642d..7f95e36 100644 --- a/src/ts/containers/member/Regist.tsx +++ b/src/ts/containers/member/Regist.tsx @@ -69,6 +69,7 @@ export class Regist extends React.Component { handleSignUp = () => { + let output: string; let obj: any; //new object declaration diff --git a/src/ts/containers/target/TargetList.tsx b/src/ts/containers/target/TargetList.tsx index a59aacf..a0dba91 100644 --- a/src/ts/containers/target/TargetList.tsx +++ b/src/ts/containers/target/TargetList.tsx @@ -7,6 +7,8 @@ import Paper from 'material-ui/Paper'; import { OFRest } from '../../components/Rest'; import * as Utils from '../../components/Utils'; +import RaisedButton from 'material-ui/RaisedButton'; + const styles = { test: { display: 'inline-block', @@ -51,7 +53,7 @@ function wrapState(ComposedComponent: any, par: any) { }; } -var testRes = "[{\"id\":1,\"ip\":3232235882,\"port\":5432,\"targetType\":\"DATABASE\",\"vendorName\":\"PostgreSQL 9.5.0\",\"kinds\":\"PostgreSQL\",\"version\":\"9.5.0\",\"createDate\":1496631864025,\"member\":{\"id\":1,\"email\":\"insanity33@loafle.com\",\"pwSalt\":\"salktttt\",\"digest\":\"bbbbbbbbb\",\"name\":\"insanity3\",\"company\":\"loafle\",\"phone\":\"000-000-0000\",\"authorizedDate\":null}},{\"id\":2,\"ip\":3232235882,\"port\":5432,\"targetType\":\"DATABASE\",\"vendorName\":\"PostgreSQL 9.5.0\",\"kinds\":\"PostgreSQL\",\"version\":\"9.5.0\",\"createDate\":1496635285090,\"member\":{\"id\":1,\"email\":\"insanity33@loafle.com\",\"pwSalt\":\"salktttt\",\"digest\":\"bbbbbbbbb\",\"name\":\"insanity3\",\"company\":\"loafle\",\"phone\":\"000-000-0000\",\"authorizedDate\":null}},{\"id\":3,\"ip\":3232235882,\"port\":5432,\"targetType\":\"DATABASE\",\"vendorName\":\"PostgreSQL 9.5.0\",\"kinds\":\"PostgreSQL\",\"version\":\"9.5.0\",\"createDate\":-62135596800000,\"member\":{\"id\":1,\"email\":\"\",\"pwSalt\":\"\",\"digest\":\"\",\"name\":\"\",\"company\":\"\",\"phone\":\"\",\"authorizedDate\":0}}]"; +var testRes = "[{\"id\":1,\"ip\":3232235882,\"port\":5432,\"targetType\":\"DATABASE\",\"vendorName\":\"PostgreSQL 9.5.0\",\"kinds\":\"PostgreSQL\",\"version\":\"9.5.0\",\"createDate\":1496631864025,\"member\":{\"id\":1,\"email\":\"insanity33@loafle.com\",\"pwSalt\":\"salktttt\",\"digest\":\"bbbbbbbbb\",\"name\":\"insanity3\",\"company\":\"loafle\",\"phone\":\"000-000-0000\",\"authorizedDate\":null}}]"; var RES = JSON.parse(testRes); @@ -62,35 +64,49 @@ export class TargetList extends React.Component { this.componentWillMount = this.componentWillMount.bind(this) + this.getTargetList = this.getTargetList.bind(this); + + } componentWillMount() { - this.getTargetList(); + } getTargetList() { + let obj: any + obj = { + "id":"0", + "member":{ + "id":"1" + } + }; - // let os: OFRest = new OFRest("Member", "Regist", obj); + let os: OFRest = new OFRest("Target", "List", obj); - // os.Call().then(function (res) { - // return res.json(); - // }).then(function (json) { - // console.log(json); - // }).catch(function (err) { - // console.log(err); - // }); - - + os.Call().then(function (res) { + return res.json(); + }).then(function (json) { + + RES = JSON.parse(json) + + }).catch(function (err) { + console.log(err); + }); } handleSelect(idx: any) { this.props.onChange(idx); } + handleSignUp() { + this.getTargetList() + } + render() { - let num :number; + let num: number; num = 1; return (
@@ -103,14 +119,14 @@ export class TargetList extends React.Component { secondaryText={'Zone'} initiallyOpen={true} nestedItems={[ - + RES.map(function (item: any, index: number) { - - let port :string; + + let port: string; port = "Port : " - - + + return ( { value={num++} primaryText={item.vendorName} secondaryText={item.port} />, - + ]} /> ) @@ -130,7 +146,7 @@ export class TargetList extends React.Component { ]} /> - +
);