diff --git a/src/ts/containers/test/ProbeDetails.tsx b/src/ts/containers/test/ProbeDetails.tsx index fff8a5d..3d14ab8 100644 --- a/src/ts/containers/test/ProbeDetails.tsx +++ b/src/ts/containers/test/ProbeDetails.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; import { Button, Table, Label, Segment, Header, Container } from 'semantic-ui-react'; import { TargetTable } from './Targets'; -import { DetailContainer } from './commons/DetailContainer'; export class ProbeDetails extends React.Component { @@ -16,12 +15,11 @@ export class ProbeDetails extends React.Component { } render() { - const items = [ - { name: 'Info', child: }, - { name: 'Targets', child: }, - ]; return ( - + + + + ); } } diff --git a/src/ts/containers/test/Probes.tsx b/src/ts/containers/test/Probes.tsx index 976176b..dba2358 100644 --- a/src/ts/containers/test/Probes.tsx +++ b/src/ts/containers/test/Probes.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Table, Header, Container } from 'semantic-ui-react'; import { ProbeDetails } from './ProbeDetails'; - +import { ListContainer } from './commons/ListContainer'; export class Probes extends React.Component { @@ -80,12 +80,10 @@ export class Probes extends React.Component { render() { if (this.state.isDetail) { - return this.setState({isDetail:false})}/>; - } - - return ( + return this.setState({ isDetail: false })} />; + } + let probeList = -
Probe
@@ -109,7 +107,10 @@ export class Probes extends React.Component { ))}
-
+ ; + + return ( + ); } } diff --git a/src/ts/containers/test/TargetDetails.tsx b/src/ts/containers/test/TargetDetails.tsx index 7135813..0773432 100644 --- a/src/ts/containers/test/TargetDetails.tsx +++ b/src/ts/containers/test/TargetDetails.tsx @@ -23,11 +23,15 @@ export class TargetDetails extends React.Component { const items = [ { name: 'Info', child: }, - { name: 'Sensors', child: }, + { name: 'Sensors', child: }, ]; return ( - + // + + + + ); } } @@ -55,7 +59,7 @@ export class TargetBasicInfo extends React.Component {
Name
-
+ ??? @@ -64,7 +68,7 @@ export class TargetBasicInfo extends React.Component {
Type
-
+ ???? @@ -73,7 +77,7 @@ export class TargetBasicInfo extends React.Component {
Sensor count
-
+ ??? @@ -82,7 +86,7 @@ export class TargetBasicInfo extends React.Component {
Created at
-
+ ??? diff --git a/src/ts/containers/test/commons/ListContainer.tsx b/src/ts/containers/test/commons/ListContainer.tsx new file mode 100644 index 0000000..b6a199a --- /dev/null +++ b/src/ts/containers/test/commons/ListContainer.tsx @@ -0,0 +1,28 @@ +import * as React from 'react'; +import { Grid } from 'semantic-ui-react'; + +export class ListContainer extends React.Component { + + constructor(props: any, context: any) { + super(props, context); + this.state = { + }; + } + + showContents() { + return this.props.contents; + } + + render() { + return ( + + + CHART AREA + + + {this.showContents()} + + + ); + } +} \ No newline at end of file diff --git a/src/ts/containers/test/commons/SideBarContainer.tsx b/src/ts/containers/test/commons/SideBarContainer.tsx new file mode 100644 index 0000000..a293064 --- /dev/null +++ b/src/ts/containers/test/commons/SideBarContainer.tsx @@ -0,0 +1,33 @@ +import * as React from 'react'; +import { Sidebar, Segment } from 'semantic-ui-react'; + +export class SideBarContainer extends React.Component { + + constructor(props: any, context: any) { + super(props, context); + this.state = { + }; + } + + showContents() { + return this.props.contents; + } + + render() { + return ( + + + test contents + + + ); + } +} \ No newline at end of file diff --git a/src/ts/containers/test/layout/TitleBar.tsx b/src/ts/containers/test/layout/TitleBar.tsx index da75f89..6b20f1e 100644 --- a/src/ts/containers/test/layout/TitleBar.tsx +++ b/src/ts/containers/test/layout/TitleBar.tsx @@ -9,20 +9,19 @@ export class TitleBar extends React.Component { }; } - handleMenu(idx: number) { - alert(idx); - } - render() { let subMenus = [ { "name": "Menu1", + "href": "#/test2" }, { "name": "Menu2", + "href": "#/test3" }, { "name": "Menu3", + "href": "#/test4" }, ]; return ( @@ -43,7 +42,7 @@ export class TitleBar extends React.Component { {subMenus.map((menu: any, index: number) => ( - + ))}