Curtains style fix

This commit is contained in:
Claudio Maggioni (maggicl) 2020-04-27 14:14:11 +02:00
parent a54df637cd
commit 29d2815a77
2 changed files with 106 additions and 99 deletions

View File

@ -6,7 +6,10 @@ import { connect } from "react-redux";
class Curtain extends Component {
constructor(props) {
super(props);
this.state = { intensity: this.props.stateOrDevice.intensity, timeout: null };
this.state = {
intensity: this.props.stateOrDevice.intensity,
timeout: null,
};
this.setIntensity = this.setIntensity.bind(this);
}
@ -22,12 +25,15 @@ class Curtain extends Component {
onClickDevice = () => {
const on = !this.turnedOn;
if(this.props.tab==="Devices"){
if (this.props.tab === "Devices") {
this.props
.saveDevice({ ...this.props.stateOrDevice, on })
.catch((err) => console.error("curtains update error", err));
}else{
this.props.updateState({ id: this.props.sceneState.id, on: on },this.props.sceneState.kind);
} else {
this.props.updateState(
{ id: this.props.sceneState.id, on: on },
this.props.sceneState.kind
);
}
};
@ -52,12 +58,15 @@ class Curtain extends Component {
saveIntensity = () => {
const intensity = Math.round(this.state.intensity);
if(this.props.tab==="Devices"){
if (this.props.tab === "Devices") {
this.props
.saveDevice({ ...this.props.stateOrDevice, intensity })
.catch((err) => console.error("curtain update error", err));
}else{
this.props.updateState({ id: this.props.sceneState.id, intensity: intensity },this.props.sceneState.kind);
} else {
this.props.updateState(
{ id: this.props.sceneState.id, intensity: intensity },
this.props.sceneState.kind
);
}
};
@ -71,7 +80,6 @@ class Curtain extends Component {
}
};
///*this took me way too much more time than it should have*/
handleChange = (a) => {
@ -81,7 +89,7 @@ class Curtain extends Component {
render() {
return (
<div className="container">
<div className="container curtain-container">
<div
className="open-container"
style={{
@ -100,16 +108,15 @@ class Curtain extends Component {
max="100"
/>
</div>
);
}
}
const mapStateToProps = (state, ownProps) => ({
get stateOrDevice(){
if(state.active.activeTab==="Devices"){
get stateOrDevice() {
if (state.active.activeTab === "Devices") {
return state.devices[ownProps.id];
}else{
} else {
return state.sceneStates[ownProps.id];
}
},

View File

@ -4,7 +4,7 @@
box-sizing: border-box;
}
.container {
.container.curtain-container {
position: relative;
margin-top: 10%;
width: 18rem;