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:
crusader 2017-07-21 17:10:14 +09:00
commit 22ab907d59
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ class LeftMenu extends React.Component<Props, State> {
<Header inverted sub icon='tasks' content='Metrics' /> <Header inverted sub icon='tasks' content='Metrics' />
</Menu.Item> </Menu.Item>
<Menu.Item name='Alerts' href='/' > <Menu.Item name='Alerts' onClick={(e) => this.props.onChangeUrl('/temp/discovery')}>
<Header inverted sub icon='alarm' content='Alerts' /> <Header inverted sub icon='alarm' content='Alerts' />
</Menu.Item> </Menu.Item>

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

@ -9,6 +9,7 @@ import ProbeList from '../monitoring/probe/List';
import ProbeDetail from '../monitoring/probe/Detail'; import ProbeDetail from '../monitoring/probe/Detail';
import SensorList from '../monitoring/sensor/List'; import SensorList from '../monitoring/sensor/List';
import SensorSetup from '../monitoring/sensor/Setup'; import SensorSetup from '../monitoring/sensor/Setup';
import Discovery from '../../../temp/react/components/Discovery'
export interface Props extends RouteComponentProps<any> { export interface Props extends RouteComponentProps<any> {
} }
@ -43,6 +44,7 @@ export class AppLayout extends React.Component<Props, State> {
<Route exact path={`${this.props.match.url}/probe/:id`} component={ProbeDetail} /> <Route exact path={`${this.props.match.url}/probe/:id`} component={ProbeDetail} />
<Route exact path={`${this.props.match.url}/sensor_list`} component={SensorList} /> <Route exact path={`${this.props.match.url}/sensor_list`} component={SensorList} />
<Route exact path={`${this.props.match.url}/sensor_setup`} component={SensorSetup} /> <Route exact path={`${this.props.match.url}/sensor_setup`} component={SensorSetup} />
<Route exact path={`${this.props.match.url}/discovery`} component={Discovery} />
<Footer /> <Footer />
</Segment> </Segment>