smarthut/frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added updateState to store

Browse Source
This commit is contained in:
Jacob Salvi 2020-04-25 15:37:40 +02:00
parent a3eff85149
commit 1484026afd
5 changed files with 87 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
smart-hut/src/components/dashboard/devices/Curtain.js
View File

@ -23,9 +23,13 @@ class Curtain extends Component {
onClickDevice = () => {
const on = !this.turnedOn;
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("curtains update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("curtains update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
setIntensity(intensity) {
@ -49,9 +53,13 @@ class Curtain extends Component {
saveIntensity = () => {
const intensity = Math.round(this.state.intensity);
this.props
.saveDevice({ ...this.props.device, intensity })
.catch((err) => console.error("curtains update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, intensity })
.catch((err) => console.error("curtain update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
helper = () => {

22
smart-hut/src/components/dashboard/devices/Light.js
View File

@ -59,9 +59,14 @@ class Light extends Component {
onClickDevice = () => {
const on = !this.turnedOn;
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("regular light update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("regular light update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
getIcon = () => {
@ -89,9 +94,13 @@ class Light extends Component {
saveIntensity = () => {
const intensity = Math.round(this.state.intensity);
this.props
.saveDevice({ ...this.props.device, intensity })
.catch((err) => console.error("intensity light update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, intensity })
.catch((err) => console.error("regular light update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
render() {
@ -150,5 +159,6 @@ class Light extends Component {
const mapStateToProps = (state, ownProps) => ({
device: state.devices[ownProps.id],
});
const LightContainer = connect(mapStateToProps, RemoteService)(Light);
export default LightContainer;

10
smart-hut/src/components/dashboard/devices/SmartPlug.js
View File

@ -33,9 +33,13 @@ class SmartPlug extends Component {
onClickDevice = () => {
const on = !this.turnedOn;
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("smart plug update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("smart plug update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
getIcon = () => {

40
smart-hut/src/components/dashboard/devices/Thermostats.js
View File

@ -63,23 +63,35 @@ class Thermostats extends Component {
//i came to the conclusion that is not possible to set mode.
//this.mode = "HEATING";
const turnOn = mode;
this.props
.saveDevice({ ...this.props.device, turnOn })
.catch((err) => console.error("regular light update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, turnOn })
.catch((err) => console.error("thermostat update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
}
onClickDevice = () => {
const on = !this.turnedOn;
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("regular light update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, on })
.catch((err) => console.error("thermostat update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
};
//It seems to work
saveTargetTemperature(targetTemperature) {
this.props
.saveDevice({ ...this.props.device, targetTemperature })
.catch((err) => console.error(" update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, targetTemperature })
.catch((err) => console.error("thermostat update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
}
setTargetTemperature(newTemp) {
@ -101,9 +113,13 @@ class Thermostats extends Component {
//I have no idea why it doesn't want to update the temperature
saveInternalSensorTemperature(internalSensorTemperature) {
this.props
.saveDevice({ ...this.props.device, internalSensorTemperature })
.catch((err) => console.error(" update error", err));
if(this.props.tab==="Devices"){
this.props
.saveDevice({ ...this.props.device, internalSensorTemperature })
.catch((err) => console.error("thermostat update error", err));
}else{
this.props.updateState({ ...this.props.device, on },this.props.type);
}
}
setInternalSensorTemperature(newTemp) {

22
smart-hut/src/remote.js
View File

@ -374,6 +374,28 @@ export const RemoteService = {
};
},
//
updateState: (data,type)=>{
return (dispatch) => {
let url;
if(type=="dimmableState"){
url="/dimmableState"
}else{
url="/switchableState"
}
return Endpoint["put"](url, {}, data)
.then((res) => {
dispatch(actions.stateSave(res.data));
return res.data;
})
.catch((err) => {
console.warn("Update device: ", data, "error: ", err);
throw new RemoteError(["Network error"]);
});
};
},
/**
* Creates/Updates a device with the given data. If
* data.id is truthy, then a update call is performed,