Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' into 'dev'

Resolve "temperature sensor - color circle change with temperature value"

Closes #103

See merge request sa4-2020/the-sanmarinoes/frontend!131

smart-hut/src/components/RoomModal.js

@@ -94,12 +94,12 @@ class RoomModal extends Component {
   };
 
   setSureTrue = () => {
-    this.setState({sure: true})
+    this.setState({ sure: true });
-  }
+  };
 
-  setSureFalse= () => {
+  setSureFalse = () => {
-    this.setState({sure: false})
+    this.setState({ sure: false });
-  }
+  };
 
   changeSomething = (event) => {
     let nam = event.target.name;
@@ -231,21 +231,22 @@ class RoomModal extends Component {
 
             {this.type === "modify" ? (
               <div>
-              <Button
+                <Button
-                icon
+                  icon
-                labelPosition="left"
+                  labelPosition="left"
-                inverted
+                  inverted
-                color="red"
+                  color="red"
-                onClick={this.setSureTrue}
+                  onClick={this.setSureTrue}
-              >
+                >
-                <Icon name="trash alternate" />
+                  <Icon name="trash alternate" />
-                Delete Room </Button>
+                  Delete Room{" "}
+                </Button>
                 <Confirm
-                open={this.state.sure}
+                  open={this.state.sure}
-                onCancel={this.setSureFalse}
+                  onCancel={this.setSureFalse}
-                onConfirm={this.deleteRoom}/>
+                  onConfirm={this.deleteRoom}
-                </div>
+                />
-
+              </div>
             ) : null}
           </Modal.Content>
           <Modal.Actions>

smart-hut/src/components/dashboard/devices/NewDevice.js

@@ -141,10 +141,14 @@ class NewDevice extends Component {
       case "buttonDimmer":
       case "knobDimmer":
         outputs = this.state.lightsAttached;
-        if (this.state.lightsAttached === undefined ||
+        if (
-            this.state.lightsAttached.length === 0) {
+          this.state.lightsAttached === undefined ||
-            alert("No lights attached to this switch! Please, add a light a first.");
+          this.state.lightsAttached.length === 0
-            return;
+        ) {
+          alert(
+            "No lights attached to this switch! Please, add a light a first."
+          );
+          return;
         }
         break;
       default:
@@ -165,11 +169,17 @@ class NewDevice extends Component {
   render() {
     const deviceOptions = [
       //stuff
-      { key: "thermostat", text: "Thermostat", value: "thermostat", 
+      {
-        image: {avatar: true, src: "/img/thermostat-icon.png"} 
+        key: "thermostat",
+        text: "Thermostat",
+        value: "thermostat",
+        image: { avatar: true, src: "/img/thermostat-icon.png" },
       },
-      { key: "curtains", text: "Curtain", value: "curtains", 
+      {
-        image: {avatar: true, src: "/img/curtains-icon.png"} 
+        key: "curtains",
+        text: "Curtain",
+        value: "curtains",
+        image: { avatar: true, src: "/img/curtains-icon.png" },
       },
       //stuff ends
       {

smart-hut/src/components/dashboard/devices/Sensor.js

@@ -123,6 +123,18 @@ class Sensor extends Component {
     return this.iconOff;
   };
 
+  temperatureColor = (value) => {
+    let hue = 100;
+    const min = 16;
+    const max = 20;
+    if (value >= min && value < max) {
+      hue = 100 - ((value - min) * 100) / (max - min);
+    } else if (value >= max) {
+      hue = 0;
+    }
+    return `hsl(${hue}, 100%, 50%)`;
+  };
+
   render() {
     const MotionSensor = (props) => {
       return (
@@ -161,11 +173,18 @@ class Sensor extends Component {
             >
               <CircularProgress
                 strokeWidth="2rem"
-                stroke={this.colors.progress}
+                stroke={
+                  this.props.stateOrDevice.sensor === "TEMPERATURE"
+                    ? this.temperatureColor(this.state.value)
+                    : this.colors.progress
+                }
                 fill={this.colors.circle}
               />
               <text
-                style={{ ...valueStyle, fill: this.colors.text }}
+                style={{
+                  ...valueStyle,
+                  fill: this.colors.text,
+                }}
                 x={100}
                 y={110}
                 textAnchor="middle"
@@ -177,7 +196,10 @@ class Sensor extends Component {
                 {this.units}
               </text>
               <text
-                style={{ ...sensorText, fill: this.colors.text }}
+                style={{
+                  ...sensorText,
+                  fill: this.colors.text,
+                }}
                 x={100}
                 y={150}
                 textAnchor="middle"

smart-hut/src/views/Dashboard.js

@@ -8,10 +8,7 @@ import ScenesNavbar from "./ScenesNavbar";
 import HostsNavbar from "./HostsNavbar";
 import MyHeader from "../components/HeaderController";
 import { Grid, Responsive, Button, Menu } from "semantic-ui-react";
-import {
+import { mobilePanelStyle } from "../components/dashboard/devices/styleComponents";
-  panelStyle,
-  mobilePanelStyle,
-} from "../components/dashboard/devices/styleComponents";
 
 import { RemoteService } from "../remote";
 import { connect } from "react-redux";
@@ -84,10 +81,10 @@ class Dashboard extends Component {
     // needed to correctly assign the background image
     //in case a room has one.
     let backgroundImageHelper;
-    if(this.activeTab==="Devices"){
+    if (this.activeTab === "Devices") {
-      backgroundImageHelper=this.props.allRooms;
+      backgroundImageHelper = this.props.backgroundImage;
-    }else{
+    } else {
-      backgroundImageHelper=null;
+      backgroundImageHelper = null;
     }
     //console.log("helper is",helper)
     return (
@@ -135,15 +132,19 @@ class Dashboard extends Component {
                 </Grid.Column>
               )}
               <Grid.Column width={this.hasNavbar ? 13 : 16}>
-                <div style={
+                <div
-                  {backgroundImage:"url("+ backgroundImageHelper+")",
+                  style={{
+                    backgroundImage: "url(" + backgroundImageHelper + ")",
                     backgroundColor: "#fafafa",
                     height: "85vh",
                     padding: "0rem 3rem",
                     color: "#000000",
                     overflow: "auto",
-                    maxHeight: "75vh",}
+                    maxHeight: "75vh",
-                }>{this.renderTab(this.activeTab)}</div>
+                  }}
+                >
+                  {this.renderTab(this.activeTab)}
+                </div>
               </Grid.Column>
             </Grid.Row>
           </Grid>
@@ -216,26 +217,16 @@ class Dashboard extends Component {
 
 const mapStateToProps = (state, _) => ({
   activeTab: state.active.activeTab,
-  get currentRoom(){
+  get currentRoom() {
     return state.active.activeRoom;
   },
-  //this took me way longer to figure out than it should have
+  get backgroundImage() {
-  get allRooms(){
+    if (state.active.activeRoom === -1) {
-    if(state.active.activeRoom==-1){
       return null;
-    }
+    } else {
-    for(let i in state.rooms){
+      return state.rooms[state.active.activeRoom].image;
-      if(i==state.active.activeRoom){
-        //console.log("check",state.rooms[i].image)
-        if(state.rooms[i].image===undefined){
-          return null;
-        }else{
-          return state.rooms[i].image;
-        }
-      }
     }
   },
-
 });
 
 const setActiveTab = (activeTab) => {

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+