overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/overflow/overflow_app

Browse Source
This commit is contained in:
snoop 2017-07-26 16:23:06 +09:00
commit 847baee964
11 changed files with 129 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -23,6 +23,7 @@
"@types/auth0-lock": "^10.16.0",
"@types/history": "^4.6.0",
"@types/jest": "^19.2.4",
"@types/lodash": "^4.14.69",
"@types/prop-types": "^15.5.1",
"@types/react": "^15.0.38",
"@types/react-addons-test-utils": "^0.14.19",
@ -72,6 +73,7 @@
"history": "^4.6.3",
"immutable": "^3.8.1",
"inversify": "^4.2.0",
"lodash": "^4.17.4",
"prop-types": "^15.5.10",
"react": "^15.6.1",
"react-dom": "^15.6.1",

BIN
public/asset/image/overFlow_CI_blue_180.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

2
public/index.html
View File

@ -16,7 +16,7 @@
</head>
<body>
<div id="appContainer"></div>
<div id="appContainer" class="fullHeight"></div>
</body>
</html>

2
src/ts/@overflow/app/views/layout/LogoBar.tsx
View File

@ -28,7 +28,7 @@ export class LogoBar extends React.Component<any, any> {
<Container fluid style={{ background: '#f8f8f8', 'paddingRight': '7px' }}>
<Menu borderless secondary >
<Menu.Item name='logo'>
{/* <Image src='https://lh3.googleusercontent.com/EaEViB7RYr3Rhhez8zY0TYsNsS5Rv2i63kyiQ5ym0rhQh38KRXBh7BDFo4mjDTDU_Hm6FAVg35247ZM1wE6cO-TuBP4wxYW2SG4hYoojqkUomu587xg3t50VGUSceK17-LUZhM-5XoCsXUXBHtfXVMqMZ2rUb23tgm7Kuv7eTgZZz0o9_dB0lApoi57EBVBNX8_qIDSH3YmGfvqhnKeh5AYnnBG_QXlTg1JExwtMehCe8KgXs4-vLuVicPCCuJ2AXSoWFpVXL9TVhrrMOkeuGd-6PGAFiNxeTG6NylQKwbQikx3Mx7KmGq3iSc8mqp0AmwjptG2DtS7nqwNaAZAi1DtraHYgJcE_tfpEgnZfFSWmVYQYcUe98pfZR11OfJErdJxE3w-mL1b4MoyufB0VkSlFM1BpMlfP3OsnnDIdNAXthT6MuLtI2iLv_CNeoDKi3fdH-zIcSmoArgAFrAo0-9oYUfvQDdaC_8MMddc97b_L78fzFOPRGIf52Ajr-Ia6sjdyDFdJ46-wPKfMW8XHnFfA96NsIcA-HYRZ7GTteJOzVq6HEabwnurZdTxdmCjzGHcb7OEu00DkVMhM6WbWZ0L8HWpIk92sy-sKbprHe-9oh_9WaxJzPrlG=w180-h30-no'
{/*<Image src='../asset/image/overFlow_CI_blue_180.png'
style={{width:'120px'}} onClick={this.handleLogoClick} /> */}
</Menu.Item>
<Popup trigger={<Menu.Item

10
src/ts/@overflow/app/views/layout/TargetDetailLayout.tsx
View File

@ -7,7 +7,7 @@ import TitleBarContainer from './TitleBarContainer';
import LeftMenu from './LeftMenu';
import TargetDetail from '../../views/infrastructure/target/Detail';
import ProbeHistory from '../../views/monitoring/probe/History';
import SensorList from '../../views/monitoring/sensor/List';
export interface Props extends RouteComponentProps<any> {
@ -30,11 +30,11 @@ export class TargetDetailLayout extends React.Component<Props, State> {
const sub = [
{
'name': 'Info',
'path': this.state.currUrl + 'info',
'path': this.state.currUrl + '',
},
{
'name': 'History',
'path': this.state.currUrl + 'history',
'name': 'Sensor',
'path': this.state.currUrl + '/sensor',
},
];
return (
@ -45,7 +45,7 @@ export class TargetDetailLayout extends React.Component<Props, State> {
<TitleBarContainer title='Target Details' sub={sub} location={this.props.location.pathname} />
<Switch>
<Route exact={true} path={`${this.props.match.url}/:id`} component={TargetDetail} />
<Route exact={true} path={`${this.props.match.url}/:id/history`} component={ProbeHistory} />
<Route exact={true} path={`${this.props.match.url}/:id/sensor`} component={SensorList} />
</Switch>
<Footer />
</Segment>

9
src/ts/@overflow/discovery/react/components/DiscoveryTable.tsx
View File

@ -144,8 +144,15 @@ export class DiscoveryTable extends React.Component<Props, State> {
<Table.Cell><Input tabIndex='6' placeholder='End Port' onChange={this.handleInput.bind(this)} /></Table.Cell>
</Table.Row>
</Table.Body>
<Table.Footer>
<Table.Row>
<Table.HeaderCell colSpan='2'>
<Button icon='find' floated='right' labelPosition='left'
content='Start' primary onClick={this.discoveryStartHandler.bind(this)} />
</Table.HeaderCell>
</Table.Row>
</Table.Footer>
</Table>
<Button floated='right' primary onClick={this.discoveryStartHandler.bind(this)}> Start </Button>
</Container>
);
}

10
src/ts/@overflow/member/react/components/PWChange.tsx
View File

@ -37,11 +37,8 @@ export class PWChange extends React.Component<Props, State> {
public render(): JSX.Element {
return (
<Container fluid>
<Grid>
<Grid.Row>
<Grid.Column mobile={16} tablet={5} computer={5}>
</Grid.Column>
<Grid.Column mobile={16} tablet={6} computer={6}>
<Grid centered verticalAlign='middle'>
<Grid.Column mobile={16} tablet={6} computer={5}>
<Form>
<Form.Input placeholder='Password' type='password' onChange={
(event: React.SyntheticEvent<HTMLInputElement>, data: InputOnChangeData) => {
@ -57,9 +54,6 @@ export class PWChange extends React.Component<Props, State> {
</Form.Group>
</Form>
</Grid.Column>
<Grid.Column mobile={16} tablet={4} computer={5}>
</Grid.Column>
</Grid.Row>
</Grid>
</Container>
);

25
src/ts/@overflow/member/react/components/SignIn.tsx
View File

@ -50,12 +50,8 @@ export class SignIn extends React.Component<Props, State> {
public render(): JSX.Element {
return (
<Container fluid>
<Grid>
<Grid.Row>
<Grid.Column mobile={16} tablet={5} computer={5}>
</Grid.Column>
<Grid.Column mobile={16} tablet={6} computer={6}>
<Grid textAlign='center' className='fullHeight' verticalAlign='middle'>
<Grid.Column mobile={16} tablet={6} computer={5}>
<Form>
<Form.Input fluid placeholder='Email' onChange={
(event: React.SyntheticEvent<HTMLInputElement>, data: InputOnChangeData) => {
@ -73,24 +69,15 @@ export class SignIn extends React.Component<Props, State> {
<Button fluid style={{margin:'7'}} href='/#/test2'> Sign Up </Button>
</Form.Group>
</Form>
</Grid.Column>
<Grid.Column mobile={16} tablet={4} computer={5}>
</Grid.Column>
</Grid.Row>
</Grid>
<Modal size='small' open={this.state.forgotPopup} onClose={this.PopupClose}>
<Modal.Header>Change your password</Modal.Header>
<Modal.Content >
Enter email address
<Grid>
<Grid.Column mobile={16} tablet={3} computer={4}>
</Grid.Column>
<Grid.Column mobile={16} tablet={10} computer={8}>
<Grid centered>
<Grid.Column mobile={14} tablet={8} computer={6}>
<Input fluid placeholder='Email' />
</Grid.Column>
<Grid.Column mobile={16} tablet={3} computer={4}>
</Grid.Column>
</Grid>
</Modal.Content>
<Modal.Actions>
@ -111,7 +98,9 @@ export class SignIn extends React.Component<Props, State> {
<Button primary onClick={this.PopupClose}> Ok </Button>
</Modal.Actions>
</Modal>
</Container>
</Grid.Column>
</Grid>
);
}

10
src/ts/@overflow/member/react/components/SignUp.tsx
View File

@ -58,11 +58,8 @@ export class SignUp extends React.Component<Props, State> {
public render(): JSX.Element {
return (
<Container fluid>
<Grid>
<Grid.Row>
<Grid.Column mobile={16} tablet={5} computer={5}>
</Grid.Column>
<Grid.Column mobile={16} tablet={6} computer={6}>
<Grid centered verticalAlign='middle'>
<Grid.Column mobile={16} tablet={6} computer={5}>
<Form>
<Form.Input fluid value={this.state.email} placeholder='Email' onChange={
(event: React.SyntheticEvent<HTMLInputElement>, data: InputOnChangeData) => {
@ -104,9 +101,6 @@ export class SignUp extends React.Component<Props, State> {
</Form.Group>
</Form>
</Grid.Column>
<Grid.Column mobile={16} tablet={4} computer={5}>
</Grid.Column>
</Grid.Row>
</Grid>
</Container>

2
src/ts/@overflow/target/react/TargetDetail.tsx
View File

@ -17,7 +17,7 @@ export function mapDispatchToProps(dispatch: Dispatch<any>): DispatchProps {
return {
onRead: (id: string) => {
dispatch(targetDetailActions.request(id));
}
},
};
}

2
src/ts/@overflow/target/react/components/TargetDetail.tsx
View File

@ -86,7 +86,7 @@ export class TargetDetail extends React.Component<Props, State> {
return (
<Container fluid>
<TargetBasicInfo target={this.state.targetTemp} />
<SensorList target={this.props.target} />
{/*<SensorList target={this.props.target} />*/}
</Container>
);
}