Made routing able to view different devices
This commit is contained in:
parent
ad6306ad6e
commit
472df851f4
@ -1,7 +1,7 @@
|
|||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
// import DevTools from "mobx-react-devtools";
|
// import DevTools from "mobx-react-devtools";
|
||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { Redirect, Route, Switch } from "react-router";
|
import { Redirect, Route, RouteComponentProps, Switch } from "react-router";
|
||||||
import { BrowserRouter as Router } from "react-router-dom";
|
import { BrowserRouter as Router } from "react-router-dom";
|
||||||
import { Container } from "semantic-ui-react";
|
import { Container } from "semantic-ui-react";
|
||||||
|
|
||||||
@ -12,9 +12,9 @@ import "font-awesome/css/font-awesome.css";
|
|||||||
import "semantic-ui-css/semantic.css";
|
import "semantic-ui-css/semantic.css";
|
||||||
import "@app/styles/app.scss";
|
import "@app/styles/app.scss";
|
||||||
|
|
||||||
function DevicePage() {
|
function DevicePage({match}: RouteComponentProps<{deviceId: string}>) {
|
||||||
return (
|
return (
|
||||||
<DevicesView/>
|
<DevicesView deviceId={match.params.deviceId}/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ class App extends React.Component {
|
|||||||
<NavBar/>
|
<NavBar/>
|
||||||
|
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route path="/devices/grinklers" component={DevicePage}/>
|
<Route path="/devices/:deviceId" component={DevicePage}/>
|
||||||
<Route path="/messagesTest" component={MessagesTestPage}/>
|
<Route path="/messagesTest" component={MessagesTestPage}/>
|
||||||
<Redirect to="/"/>
|
<Redirect to="/"/>
|
||||||
</Switch>
|
</Switch>
|
||||||
|
@ -4,11 +4,11 @@ import { Item } from "semantic-ui-react";
|
|||||||
|
|
||||||
import DeviceView from "@app/components/DeviceView";
|
import DeviceView from "@app/components/DeviceView";
|
||||||
|
|
||||||
class DevicesView extends React.Component {
|
class DevicesView extends React.Component<{deviceId: string}> {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Item.Group divided>
|
<Item.Group divided>
|
||||||
<DeviceView deviceId="grinklers" />
|
<DeviceView deviceId={this.props.deviceId} />
|
||||||
</Item.Group>
|
</Item.Group>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -147,6 +147,9 @@ class MqttSprinklersDevice extends s.SprinklersDevice {
|
|||||||
const brokerConnected = apiClient.connected;
|
const brokerConnected = apiClient.connected;
|
||||||
this.connectionState.serverToBroker = brokerConnected;
|
this.connectionState.serverToBroker = brokerConnected;
|
||||||
if (brokerConnected) {
|
if (brokerConnected) {
|
||||||
|
if (this.connectionState.brokerToDevice == null) {
|
||||||
|
this.connectionState.brokerToDevice = false;
|
||||||
|
}
|
||||||
this.doSubscribe();
|
this.doSubscribe();
|
||||||
} else {
|
} else {
|
||||||
this.connectionState.brokerToDevice = false;
|
this.connectionState.brokerToDevice = false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user