diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js index 1d84c6b..6c797ab 100644 --- a/smart-hut/src/components/HeaderController.js +++ b/smart-hut/src/components/HeaderController.js @@ -1,5 +1,12 @@ import React from "react"; -import { Grid, Divider, Button, Label, Responsive } from "semantic-ui-react"; +import { + Grid, + Divider, + Button, + Label, + Responsive, + Checkbox, +} from "semantic-ui-react"; import { Segment, Image } from "semantic-ui-react"; import { RemoteService } from "../remote"; import { withRouter } from "react-router-dom"; @@ -35,6 +42,16 @@ export class MyHeader extends React.Component { .catch((err) => console.error("MyHeader fetch user info error", err)); } + setCameraEnabled(val) { + let enabled = { + cameraEnabled: val, + }; + this.props + .userPermissions(enabled) + .then(() => this.getInfo()) + .catch((err) => console.error("Camera enabled", err)); + } + render() { return (
@@ -60,6 +77,11 @@ export class MyHeader extends React.Component { + this.setCameraEnabled(val.checked)} + /> @@ -94,6 +116,7 @@ export class MyHeader extends React.Component { const mapStateToProps = (state, _) => ({ username: state.userInfo && state.userInfo.username ? state.userInfo.username : "", + cameraEnabled: state.userInfo ? state.userInfo.cameraEnabled : false, }); const LoginContainer = connect( mapStateToProps, diff --git a/smart-hut/src/components/SceneModal.js b/smart-hut/src/components/SceneModal.js index be03283..513c2e6 100644 --- a/smart-hut/src/components/SceneModal.js +++ b/smart-hut/src/components/SceneModal.js @@ -8,6 +8,7 @@ import { Form, Input, Dropdown, + Checkbox, } from "semantic-ui-react"; import SelectIcons from "./SelectIcons"; import { connect } from "react-redux"; @@ -23,6 +24,7 @@ class SceneModal extends Component { this.modifySceneModal = this.modifySceneModal.bind(this); this.deleteScene = this.deleteScene.bind(this); this.updateIcon = this.updateIcon.bind(this); + this.setGuestAccessEnabled = this.setGuestAccessEnabled.bind(this); this.setCopyFrom = this.setCopyFrom.bind(this); } @@ -41,6 +43,8 @@ class SceneModal extends Component { selectedIcon: "home", scenes: this.scenes, copyFrom: null, + guestAccessEnabled: + this.type === "new" ? null : this.props.scene.guestAccessEnabled, }; } @@ -79,7 +83,9 @@ class SceneModal extends Component { let data = { name: this.state.name, icon: this.state.selectedIcon, + guestAccessEnabled: this.state.guestAccessEnabled, }; + console.log(data); this.props .saveScene(data, this.props.id) @@ -119,6 +125,11 @@ class SceneModal extends Component { this.setState({ ...this.state, copyFrom: copyFrom.value }); } + setGuestAccessEnabled(val) { + console.log(this.state, val); + this.setState({ guestAccessEnabled: val }); + } + render() { const spaceDiv = { background: "#f4f4f4", @@ -210,6 +221,17 @@ class SceneModal extends Component { /> )} + {this.type === "modify" ? ( + + + this.setGuestAccessEnabled(val.checked) + } + /> + + ) : null} {this.type === "modify" ? ( diff --git a/smart-hut/src/components/dashboard/devices/Videocam.js b/smart-hut/src/components/dashboard/devices/Videocam.js index de77219..cdde004 100644 --- a/smart-hut/src/components/dashboard/devices/Videocam.js +++ b/smart-hut/src/components/dashboard/devices/Videocam.js @@ -31,7 +31,7 @@ class Videocam extends Component { setOnOff(onOff) { const turn = onOff; - if (this.props.tab === "Devices") { + if (this.props.tab === "Devices" || this.props.tab === "Hosts") { this.props .saveDevice({ ...this.props.device, on: turn }) .then((res) => diff --git a/smart-hut/src/remote.js b/smart-hut/src/remote.js index 666910b..4eec55d 100644 --- a/smart-hut/src/remote.js +++ b/smart-hut/src/remote.js @@ -242,6 +242,20 @@ export const RemoteService = { }); }, + /** + * Fetches user information via REST calls, if it is logged in + * @returns {Promise} promise that resolves to void and rejects + * with user-fiendly errors as a RemoteError + */ + userPermissions: (data) => { + return (dispatch) => { + return Endpoint.put("/user/permissions", {}, data).catch((err) => { + console.warn("Fetch user info error", err); + throw new RemoteError(["Network error"]); + }); + }; + }, + /** * Fetches user information via REST calls, if it is logged in * @returns {Promise} promise that resolves to void and rejects @@ -458,6 +472,7 @@ export const RemoteService = { data = { name: data.name, icon: data.icon, + guestAccessEnabled: sceneId ? data.guestAccessEnabled : false, }; return (sceneId