From f99a5d49ffb8f52d41f3c9538dd9feb90e554060 Mon Sep 17 00:00:00 2001
From: britea <andreabritesma@gmail.com>
Date: Thu, 16 Apr 2020 17:07:56 +0200
Subject: [PATCH 1/8] fixed major bug

---
 smart-hut/src/components/SceneModal.js        | 44 -------------
 .../components/dashboard/NewSceneDevice.js    | 45 ++++++++++++-
 smart-hut/src/remote.js                       | 64 +++++++++++++++----
 3 files changed, 95 insertions(+), 58 deletions(-)

diff --git a/smart-hut/src/components/SceneModal.js b/smart-hut/src/components/SceneModal.js
index cff8630..4f4901d 100644
--- a/smart-hut/src/components/SceneModal.js
+++ b/smart-hut/src/components/SceneModal.js
@@ -7,7 +7,6 @@ import {
   Responsive,
   Form,
   Input,
-  Dropdown,
 } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { RemoteService } from "../remote";
@@ -19,7 +18,6 @@ class SceneModal extends Component {
     super(props);
     this.state = this.initialState;
     this.setInitialState();
-    this.getDevices();
 
     this.addSceneModal = this.addSceneModal.bind(this);
     this.modifySceneModal = this.modifySceneModal.bind(this);
@@ -29,7 +27,6 @@ class SceneModal extends Component {
   get initialState() {
     return {
       name: this.type === "new" ? "New Scene" : this.props.room.name,
-      sceneDevices: this.type === "new" ? [{}] : [this.props.scene.devices],
       openModal: false,
     };
   }
@@ -42,12 +39,6 @@ class SceneModal extends Component {
     return !this.props.id ? "new" : "modify";
   }
 
-  getDevices() {
-    this.props
-      .fetchDevices()
-      .catch((err) => console.error(`error fetching devices:`, err));
-  }
-
   addSceneModal = (e) => {
     /*let data = {
       // DATA HERE
@@ -99,21 +90,7 @@ class SceneModal extends Component {
     this.setState({ openModal: true });
   };
 
-  setSceneDevice(e, d) {
-    this.setState({ sceneDevices: d.value });
-  }
-
   render() {
-    const availableDevices = [];
-    this.props.devices.forEach((e) => {
-      if (!this.state.sceneDevices.includes(e)) {
-        availableDevices.push({
-          key: e.id,
-          text: e.name,
-          id: e.id,
-        });
-      }
-    });
     return (
       <div>
         {!this.props.nicolaStop ? (
@@ -176,17 +153,6 @@ class SceneModal extends Component {
                   value={this.state.name}
                 />
               </Form.Field>
-              <Form.Field>
-                <label>Select devices you want to attach: </label>
-                <Dropdown
-                  name="scene devices"
-                  placeholder="Select Devices"
-                  fluid
-                  multiple
-                  onChange={this.setSceneDevice}
-                  options={availableDevices}
-                />
-              </Form.Field>
             </Form>
 
             {this.type === "modify" ? (
@@ -229,16 +195,6 @@ const setActiveScene = (activeScene) => {
 };
 
 const mapStateToProps = (state, ownProps) => ({
-  get devices() {
-    if (state.active.activeRoom === -1) {
-      return Object.values(state.devices);
-    } else {
-      const deviceArray = [
-        ...state.rooms[state.active.activeRoom].devices,
-      ].sort();
-      return deviceArray.map((id) => state.devices[id]);
-    }
-  },
   scene: ownProps.id ? state.scenes[ownProps.id] : null,
 });
 const SceneModalContainer = connect(
diff --git a/smart-hut/src/components/dashboard/NewSceneDevice.js b/smart-hut/src/components/dashboard/NewSceneDevice.js
index 0a37af2..affacb5 100644
--- a/smart-hut/src/components/dashboard/NewSceneDevice.js
+++ b/smart-hut/src/components/dashboard/NewSceneDevice.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Button, Modal, Icon, Image } from "semantic-ui-react";
+import { Button, Modal, Icon, Image, Form, Dropdown } from "semantic-ui-react";
 import { connect } from "react-redux";
 import { RemoteService } from "../../remote";
 import styled from "styled-components";
@@ -30,7 +30,18 @@ class NewSceneDevice extends Component {
 
     this.state = {
       openModal: false,
+      sceneDevices: this.props.scene ? this.props.scene.devices : {},
+      deviceName: "",
     };
+    this.getDevices();
+
+    this.setSceneDevice = this.setSceneDevice.bind(this);
+  }
+
+  getDevices() {
+    this.props
+      .fetchDevices()
+      .catch((err) => console.error(`error fetching devices:`, err));
   }
 
   handleOpen = () => {
@@ -45,7 +56,21 @@ class NewSceneDevice extends Component {
     this.handleClose();
   };
 
+  setSceneDevice(e, d) {
+    this.setState({ devicesAttached: d.value });
+  }
+
   render() {
+    const availableDevices = [];
+    this.props.devices.forEach((e) => {
+      if (!Object.keys(this.state.sceneDevices).find((d) => e.id === d)) {
+        availableDevices.push({
+          key: e.id,
+          text: e.name,
+          value: e.id,
+        });
+      }
+    });
     return (
       <Modal
         closeIcon
@@ -59,7 +84,21 @@ class NewSceneDevice extends Component {
         centered={true}
       >
         <Modal.Header>Add a New Scene Device</Modal.Header>
-        <Modal.Content></Modal.Content>
+        <Modal.Content>
+          <Form>
+            <Form.Field style={{ marginTop: "1rem" }}>
+              <label>Select devices you want to attach: </label>
+              <Dropdown
+                name="scene devices"
+                placeholder="Select Devices"
+                fluid
+                multiple
+                onChange={this.setSceneDevice}
+                options={availableDevices}
+              />
+            </Form.Field>
+          </Form>
+        </Modal.Content>
         <Modal.Actions>
           <Button
             onClick={this.createDevice}
@@ -78,7 +117,7 @@ class NewSceneDevice extends Component {
 
 const mapStateToProps = (state, _) => ({
   devices: Object.values(state.devices),
-  activeRoom: state.active.activeRoom,
+  activeScene: state.active.activeScene,
 });
 const NewSceneDeviceContainer = connect(
   mapStateToProps,
diff --git a/smart-hut/src/remote.js b/smart-hut/src/remote.js
index 825ba1d..a0e429f 100644
--- a/smart-hut/src/remote.js
+++ b/smart-hut/src/remote.js
@@ -39,8 +39,8 @@ const Endpoint = {
    * @param {[String]String} query query ('?') parameters (no params by default)
    * @param {any} body the JSON request body
    */
-  send: (method, route, query = {}, body = null, registration) => {
-    if (!registration && !Endpoint.token) {
+  send: (method, route, query = {}, body = null) => {
+    if (!Endpoint.token) {
       throw new Error("No token while performing authenticated request");
     }
 
@@ -48,11 +48,9 @@ const Endpoint = {
       method: method,
       params: query,
       data: ["put", "post"].indexOf(method) !== -1 ? body : null,
-      headers: !registration
-        ? {
-            Authorization: `Bearer ${Endpoint.token}`,
-          }
-        : {},
+      headers: {
+        Authorization: `Bearer ${Endpoint.token}`,
+      },
     }).then((res) => {
       if (!res.data && method !== "delete") {
         console.error("Response body is empty");
@@ -63,6 +61,28 @@ const Endpoint = {
     });
   },
 
+  /**
+   * Performs a non-authenticated post and put request for registration, reset-password
+   * @param {post} the desired method
+   * @param {String} route the desired route (e.g. "/rooms/1/devices")
+   * @param {[String]String} query query ('?') parameters (no params by default)
+   * @param {any} body the JSON request body
+   */
+  sendNA: (method, route, query = {}, body = null) => {
+    return Endpoint.axiosInstance(route, {
+      method: method,
+      params: query,
+      data: ["put", "post"].indexOf(method) !== -1 ? body : null,
+    }).then((res) => {
+      if (!res.data) {
+        console.error("Response body is empty");
+        return null;
+      } else {
+        return res;
+      }
+    });
+  },
+
   /**
    * Performs login
    * @param {String} usernameOrEmail
@@ -111,7 +131,18 @@ const Endpoint = {
    * @returns {Promise<*, *>} The Axios-generated promise
    */
   post(route, query, body) {
-    return this.send("post", route, query, body, true);
+    return this.send("post", route, query, body);
+  },
+
+  /**
+   * Performs a non-authenticated POST request
+   * @param {String} route the desired route (e.g. "/rooms/1/devices")
+   * @param {[String]String} query query ('?') parameters (no params by default)
+   * @param {any} body the JSON request body
+   * @returns {Promise<*, *>} The Axios-generated promise
+   */
+  postNA(route, query, body) {
+    return this.sendNA("post", route, query, body);
   },
 
   /**
@@ -125,6 +156,17 @@ const Endpoint = {
     return this.send("put", route, query, body);
   },
 
+  /**
+   * Performs a non-authenticated PUT request
+   * @param {String} route the desired route (e.g. "/rooms/1/devices")
+   * @param {[String]String} query query ('?') parameters (no params by default)
+   * @param {any} body the JSON request body
+   * @returns {Promise<*, *>} The Axios-generated promise
+   */
+  putNA(route, query = {}, body = {}) {
+    return this.sendNA("put", route, query, body);
+  },
+
   /**
    * Performs an authenticated DELETE request
    * @param {get|post|put|delete} the desired method
@@ -489,7 +531,7 @@ export class Forms {
    *  with validation errors as a String array
    */
   static submitRegistration(data) {
-    return Endpoint.post(
+    return Endpoint.postNA(
       "/register",
       {},
       {
@@ -512,7 +554,7 @@ export class Forms {
    *  with validation errors as a String array
    */
   static submitInitResetPassword(email) {
-    return Endpoint.post(
+    return Endpoint.postNA(
       "/register/init-reset-password",
       {},
       {
@@ -537,7 +579,7 @@ export class Forms {
    *  with validation errors as a String array
    */
   static submitResetPassword(confirmationToken, password) {
-    return Endpoint.post(
+    return Endpoint.putNA(
       "/register/reset-password",
       {},
       {

From 1330f3cfea19db3402e24c0e8f5eea45abd5d28e Mon Sep 17 00:00:00 2001
From: Nicola Brunner <brunnn@usi.ch>
Date: Thu, 16 Apr 2020 18:20:22 +0200
Subject: [PATCH 2/8] For edit device modal: added  possibility to exit window
 without modifications (cross) | For Sensors: Now displays general device name
 and not specific device name in the icon

---
 .../dashboard/devices/DeviceSettingsModal.js  | 13 ++++++++----
 .../components/dashboard/devices/Sensor.js    | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index fcf29a0..037118a 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -35,6 +35,7 @@ const SettingsForm = (props) => {
           onChange={handleInputChange}
           value={values.name}
           placeholder="Device name"
+          // {this.props.device.name}
         />
       </Form.Field>
 
@@ -63,9 +64,13 @@ class DeviceSettingsModal extends Component {
     this.deleteDevice = this.deleteDevice.bind(this);
   }
 
-  openModal() {
-    this.setState({ open: true });
-  }
+  closeModal = (e) => {
+    this.setState({ openModal: false });
+  };
+
+  openModal = (e) => {
+    this.setState({ openModal: true });
+  };
 
   updateDevice(values) {
     if (values.name.length === 0) return;
@@ -94,7 +99,7 @@ class DeviceSettingsModal extends Component {
 
   render() {
     const SettingsModal = () => (
-      <Modal open={this.state.open}>
+      <Modal closeIcon onClose={this.closeModal} open={this.state.openModal}>
         <Modal.Header>Settings of {this.props.device.name}</Modal.Header>
         <Modal.Content>
           <SettingsForm
diff --git a/smart-hut/src/components/dashboard/devices/Sensor.js b/smart-hut/src/components/dashboard/devices/Sensor.js
index 4d3cf81..0f7e0bd 100644
--- a/smart-hut/src/components/dashboard/devices/Sensor.js
+++ b/smart-hut/src/components/dashboard/devices/Sensor.js
@@ -53,14 +53,15 @@ class Sensor extends Component {
 
     this.colors = temperatureSensorColors;
     this.icon = "temperatureIcon.svg";
+    this.name = "Sensor";
   }
 
-  setName = () => {
-    if (this.props.device.name.length > 15) {
-      return this.props.device.name.slice(0, 12) + "...";
-    }
-    return this.props.device.name;
-  };
+  // setName = () => {
+  //   if (this.props.device.name.length > 15) {
+  //     return this.props.device.name.slice(0, 12) + "...";
+  //   }
+  //   return this.props.device.name;
+  // };
 
   componentDidUpdate(prevProps) {
     if (
@@ -83,16 +84,19 @@ class Sensor extends Component {
           this.units = "ºC";
           this.colors = temperatureSensorColors;
           this.icon = "temperatureIcon.svg";
+          this.name = "Temperature Sensor";
           break;
         case "HUMIDITY":
           this.units = "%";
           this.colors = humiditySensorColors;
           this.icon = "humidityIcon.svg";
+          this.name = "Humidity Sensor";
           break;
         case "LIGHT":
           this.units = "lm";
           this.colors = lightSensorColors;
           this.icon = "lightSensorIcon.svg";
+          this.name = "Light Sensor";
           break;
         default:
           this.units = "";
@@ -131,7 +135,7 @@ class Sensor extends Component {
             }}
           >
             <Image style={motionSensorIcon} src="/img/motionSensorIcon.svg" />
-            <span style={nameMotionStyle}>{this.props.device.name}</span>
+            <span style={nameMotionStyle}>Motion Sensor</span>
           </div>
         </div>
       );
@@ -176,7 +180,7 @@ class Sensor extends Component {
                 dy="0.4em"
                 fontWeight="bold"
               >
-                {this.setName()} ({this.props.device.id})
+                {this.name}
               </text>
             </CircularInput>
             <Image style={iconSensorStyle} src={`/img/${this.icon}`} />

From 1239559f4578eadef02514aa1ea2ed6ad37d3ca8 Mon Sep 17 00:00:00 2001
From: Nicola Brunner <brunnn@usi.ch>
Date: Thu, 16 Apr 2020 18:38:34 +0200
Subject: [PATCH 3/8] changed Home in navbar into House view as required by
 user story 1

---
 smart-hut/src/views/Navbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/smart-hut/src/views/Navbar.js b/smart-hut/src/views/Navbar.js
index cfa7b0e..d7462a5 100644
--- a/smart-hut/src/views/Navbar.js
+++ b/smart-hut/src/views/Navbar.js
@@ -82,7 +82,7 @@ class Navbar extends Component {
                       <Grid.Column>
                         <Icon name="home" size="small" />
                       </Grid.Column>
-                      <Grid.Column>HOME</Grid.Column>
+                      <Grid.Column width={8}>House View</Grid.Column>
                     </Grid.Row>
                   </Grid>
                 </Menu.Item>

From b3abffa5b70554d0491c89b6957d71a591a68288 Mon Sep 17 00:00:00 2001
From: Nicola Brunner <brunnn@usi.ch>
Date: Fri, 17 Apr 2020 11:29:40 +0200
Subject: [PATCH 4/8] made some design changes

---
 .../dashboard/devices/DeviceSettingsModal.js  |  42 +++++--
 smart-hut/src/views/ConfirmForgotPassword.js  | 106 ++++++------------
 smart-hut/src/views/ConfirmRegistration.js    | 106 ++++++------------
 smart-hut/src/views/ConfirmResetPassword.js   | 104 ++++++-----------
 smart-hut/src/views/Forgot-password.js        |   2 +-
 5 files changed, 135 insertions(+), 225 deletions(-)

diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 037118a..44e160b 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -4,10 +4,21 @@ import { connect } from "react-redux";
 import { RemoteService } from "../../../remote";
 
 const DeleteModal = (props) => (
-  <Modal trigger={<Button color="red">Remove</Button>} closeIcon>
+  <Modal
+    trigger={
+      <Button icon labelPosition="left" inverted color="red">
+        <Icon name="trash alternate" />
+        Delete device
+      </Button>
+    }
+    closeIcon
+  >
     <Header icon="archive" content="Are you sure ?" />
     <Modal.Actions>
-      <Button color="red">
+      <Button
+        color="red"
+        // onClick={this.closeModal}
+      >
         <Icon name="remove" /> No
       </Button>
       <Button onClick={() => props.removeDevice()} color="green">
@@ -38,17 +49,28 @@ const SettingsForm = (props) => {
           // {this.props.device.name}
         />
       </Form.Field>
-
       <Form.Field>
         <DeleteModal removeDevice={() => props.removeDevice(values)} />
       </Form.Field>
-      <Button
-        onClick={() => props.saveFunction(values)}
-        color="blue"
-        type="submit"
-      >
-        Save
-      </Button>
+      //{" "}
+      <Modal.Actions>
+        <Button
+          color="red"
+          // onClick={this.closeModal}
+        >
+          <Icon name="remove" />
+          Discard changes
+        </Button>
+        <Button
+          onClick={() => props.saveFunction(values)}
+          color="green"
+          type="submit"
+        >
+          <Icon name="checkmark" />
+          Save changes
+        </Button>
+        //{" "}
+      </Modal.Actions>
     </Form>
   );
 };
diff --git a/smart-hut/src/views/ConfirmForgotPassword.js b/smart-hut/src/views/ConfirmForgotPassword.js
index 99b194b..627b123 100644
--- a/smart-hut/src/views/ConfirmForgotPassword.js
+++ b/smart-hut/src/views/ConfirmForgotPassword.js
@@ -1,79 +1,43 @@
 import React, { Component } from "react";
 import HomeNavbar from "./../components/HomeNavbar";
-import { Image, Divider, Message, Grid } from "semantic-ui-react";
-
-class Paragraph extends Component {
-  state = { visible: true };
-
-  handleDismiss = () => {
-    this.setState({ visible: false });
-
-    setTimeout(() => {
-      this.setState({ visible: true });
-    }, 2000);
-  };
+import {
+  Image,
+  Divider,
+  Message,
+  Grid,
+  Button,
+  Icon,
+  Header,
+  Container,
+} from "semantic-ui-react";
 
+export default class ConfirmForgotPasswrod extends Component {
   render() {
-    if (this.state.visible) {
-      return (
-        <Message
-          onDismiss={this.handleDismiss}
-          header="Link has been sent!"
-          content="An e-mail has been sent your address, please follow the
-            instruction to create a new password"
-        />
-      );
-    }
-
     return (
-      <p>
-        <br />
-        <i>The message will return in 2s</i>
-        <br />
-        <br />
-      </p>
+      <React.Fragment>
+        <Button circular style={{ margin: "2em" }} href="/">
+          <Icon name="arrow alternate circle left" />
+          Go Home{" "}
+        </Button>
+        <Grid
+          textAlign="center"
+          style={{ height: "70vh" }}
+          verticalAlign="middle"
+        >
+          <Grid.Column style={{ maxWidth: 450 }}>
+            <Header as="h2" color="blue" textAlign="center">
+              <Image src="img/logo.png" /> Link has been sent!
+            </Header>
+            <Container textAlign="center">
+              <p>
+                An E-mail has been sent to your address, please follow the
+                instructions to create a new password. If you don't find the
+                E-mail please check also the spam folder.
+              </p>
+            </Container>
+          </Grid.Column>
+        </Grid>
+      </React.Fragment>
     );
   }
 }
-
-const MessageReg = () => (
-  <Grid>
-    <HomeNavbar />
-    <Divider />
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={6}></Grid.Column>
-      <Grid.Column width={10}>
-        <Image src="title5.png" />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Column width={3}></Grid.Column>
-    <Grid.Column width={4}>
-      <Image src="./img/logo.png" />
-    </Grid.Column>
-    <Grid.Column width={6}>
-      <Paragraph />
-    </Grid.Column>
-    <Grid.Column width={4}></Grid.Column>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={3}></Grid.Column>
-      <Grid.Column width={10}>
-        <Divider />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-  </Grid>
-);
-
-export default class ConfirmForgotPasswrod extends React.Component {
-  render() {
-    return <MessageReg />;
-  }
-}
diff --git a/smart-hut/src/views/ConfirmRegistration.js b/smart-hut/src/views/ConfirmRegistration.js
index 13af1b5..a4ea1fe 100644
--- a/smart-hut/src/views/ConfirmRegistration.js
+++ b/smart-hut/src/views/ConfirmRegistration.js
@@ -1,79 +1,43 @@
 import React, { Component } from "react";
 import HomeNavbar from "./../components/HomeNavbar";
-import { Image, Divider, Message, Grid } from "semantic-ui-react";
-
-class Paragraph extends Component {
-  state = { visible: true };
-
-  handleDismiss = () => {
-    this.setState({ visible: false });
-
-    setTimeout(() => {
-      this.setState({ visible: true });
-    }, 2000);
-  };
+import {
+  Image,
+  Divider,
+  Message,
+  Grid,
+  Button,
+  Icon,
+  Header,
+  Container,
+} from "semantic-ui-react";
 
+export default class ConfirmRegistration extends Component {
   render() {
-    if (this.state.visible) {
-      return (
-        <Message
-          onDismiss={this.handleDismiss}
-          header="Congratulation!"
-          content="An e-mail has been sent your address, please confirm
-            your registration by following the enclosed link"
-        />
-      );
-    }
-
     return (
-      <p>
-        <br />
-        <i>The message will return in 2s</i>
-        <br />
-        <br />
-      </p>
+      <React.Fragment>
+        <Button circular style={{ margin: "2em" }} href="/">
+          <Icon name="arrow alternate circle left" />
+          Go Home{" "}
+        </Button>
+        <Grid
+          textAlign="center"
+          style={{ height: "70vh" }}
+          verticalAlign="middle"
+        >
+          <Grid.Column style={{ maxWidth: 450 }}>
+            <Header as="h2" color="blue" textAlign="center">
+              <Image src="img/logo.png" /> Congratulation!
+            </Header>
+            <Container textAlign="center">
+              <p>
+                An E-mail has been sent to your address, confirm your
+                registration by following the enclosed link. If you don't find
+                the E-mail please check also the spam folder.
+              </p>
+            </Container>
+          </Grid.Column>
+        </Grid>
+      </React.Fragment>
     );
   }
 }
-
-const MessageReg = () => (
-  <Grid>
-    <HomeNavbar />
-    <Divider />
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={6}></Grid.Column>
-      <Grid.Column width={10}>
-        <Image src="title5.png" />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Column width={3}></Grid.Column>
-    <Grid.Column width={4}>
-      <Image src="./img/logo.png" />
-    </Grid.Column>
-    <Grid.Column width={6}>
-      <Paragraph />
-    </Grid.Column>
-    <Grid.Column width={4}></Grid.Column>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={3}></Grid.Column>
-      <Grid.Column width={10}>
-        <Divider />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-  </Grid>
-);
-
-export default class ConfirmRegistration extends React.Component {
-  render() {
-    return <MessageReg />;
-  }
-}
diff --git a/smart-hut/src/views/ConfirmResetPassword.js b/smart-hut/src/views/ConfirmResetPassword.js
index 0d6123d..ea4d77a 100644
--- a/smart-hut/src/views/ConfirmResetPassword.js
+++ b/smart-hut/src/views/ConfirmResetPassword.js
@@ -1,79 +1,39 @@
 import React, { Component } from "react";
 import HomeNavbar from "./../components/HomeNavbar";
-import { Image, Divider, Message, Grid } from "semantic-ui-react";
-
-class Paragraph extends Component {
-  state = { visible: true };
-
-  handleDismiss = () => {
-    this.setState({ visible: false });
-
-    setTimeout(() => {
-      this.setState({ visible: true });
-    }, 2000);
-  };
-
-  render() {
-    if (this.state.visible) {
-      return (
-        <Message onDismiss={this.handleDismiss}>
-          <Message.Header>
-            Congratulation<ins>s</ins>!
-          </Message.Header>
-          Your password has been successfully reset
-        </Message>
-      );
-    }
-
-    return (
-      <p>
-        <br />
-        <i>The message will return in 2s</i>
-        <br />
-        <br />
-      </p>
-    );
-  }
-}
-
-const MessageReg = () => (
-  <Grid>
-    <HomeNavbar />
-    <Divider />
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={6}></Grid.Column>
-      <Grid.Column width={10}>
-        <Image src="title5.png" />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Column width={3}></Grid.Column>
-    <Grid.Column width={4}>
-      <Image src="./img/logo.png" />
-    </Grid.Column>
-    <Grid.Column width={6}>
-      <Paragraph />
-    </Grid.Column>
-    <Grid.Column width={4}></Grid.Column>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}></Grid.Row>
-    <Grid.Row height={3}>
-      <Grid.Column width={3}></Grid.Column>
-      <Grid.Column width={10}>
-        <Divider />
-      </Grid.Column>
-      <Grid.Column width={3}></Grid.Column>
-    </Grid.Row>
-  </Grid>
-);
+import {
+  Image,
+  Divider,
+  Message,
+  Grid,
+  Button,
+  Icon,
+  Header,
+  Container,
+} from "semantic-ui-react";
 
 export default class ConfirmResetPassword extends Component {
   render() {
-    return <MessageReg />;
+    return (
+      <React.Fragment>
+        <Button circular style={{ margin: "2em" }} href="/">
+          <Icon name="arrow alternate circle left" />
+          Go Home{" "}
+        </Button>
+        <Grid
+          textAlign="center"
+          style={{ height: "70vh" }}
+          verticalAlign="middle"
+        >
+          <Grid.Column style={{ maxWidth: 450 }}>
+            <Header as="h2" color="blue" textAlign="center">
+              <Image src="img/logo.png" /> Congratulation!
+            </Header>
+            <Container textAlign="center">
+              <p>Your password has been successfully reset.</p>
+            </Container>
+          </Grid.Column>
+        </Grid>
+      </React.Fragment>
+    );
   }
 }
diff --git a/smart-hut/src/views/Forgot-password.js b/smart-hut/src/views/Forgot-password.js
index 511a881..6ebc2a5 100644
--- a/smart-hut/src/views/Forgot-password.js
+++ b/smart-hut/src/views/Forgot-password.js
@@ -77,7 +77,7 @@ export default class ForgotPass extends Component {
               <Form.Input
                 icon="address card outline"
                 iconPosition="left"
-                placeholder="Username or E-mail"
+                placeholder="Enter your E-mail"
                 name="user"
                 type="text"
                 onChange={this.onChangeHandler}

From 9430de90d0d1830813f70dd719c66e4677db2573 Mon Sep 17 00:00:00 2001
From: britea <andreabritesma@gmail.com>
Date: Fri, 17 Apr 2020 14:15:22 +0200
Subject: [PATCH 5/8] back to previous settings device

---
 .../dashboard/devices/DeviceSettingsModal.js  | 42 +++++--------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 44e160b..037118a 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -4,21 +4,10 @@ import { connect } from "react-redux";
 import { RemoteService } from "../../../remote";
 
 const DeleteModal = (props) => (
-  <Modal
-    trigger={
-      <Button icon labelPosition="left" inverted color="red">
-        <Icon name="trash alternate" />
-        Delete device
-      </Button>
-    }
-    closeIcon
-  >
+  <Modal trigger={<Button color="red">Remove</Button>} closeIcon>
     <Header icon="archive" content="Are you sure ?" />
     <Modal.Actions>
-      <Button
-        color="red"
-        // onClick={this.closeModal}
-      >
+      <Button color="red">
         <Icon name="remove" /> No
       </Button>
       <Button onClick={() => props.removeDevice()} color="green">
@@ -49,28 +38,17 @@ const SettingsForm = (props) => {
           // {this.props.device.name}
         />
       </Form.Field>
+
       <Form.Field>
         <DeleteModal removeDevice={() => props.removeDevice(values)} />
       </Form.Field>
-      //{" "}
-      <Modal.Actions>
-        <Button
-          color="red"
-          // onClick={this.closeModal}
-        >
-          <Icon name="remove" />
-          Discard changes
-        </Button>
-        <Button
-          onClick={() => props.saveFunction(values)}
-          color="green"
-          type="submit"
-        >
-          <Icon name="checkmark" />
-          Save changes
-        </Button>
-        //{" "}
-      </Modal.Actions>
+      <Button
+        onClick={() => props.saveFunction(values)}
+        color="blue"
+        type="submit"
+      >
+        Save
+      </Button>
     </Form>
   );
 };

From dc22c008d32399b15717c826f59e1a6c07deff64 Mon Sep 17 00:00:00 2001
From: Nicola Brunner <brunnn@usi.ch>
Date: Fri, 17 Apr 2020 14:25:22 +0200
Subject: [PATCH 6/8] changed design things

---
 smart-hut/src/components/HeaderController.js      |  4 +++-
 .../dashboard/devices/DeviceSettingsModal.js      | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js
index d6ef4c5..1d84c6b 100644
--- a/smart-hut/src/components/HeaderController.js
+++ b/smart-hut/src/components/HeaderController.js
@@ -57,7 +57,9 @@ export class MyHeader extends React.Component {
                   {this.props.username}
                 </Label>
                 <Divider />
-                <Button onClick={this.logout}>Logout</Button>
+                <Button basic inverted onClick={this.logout}>
+                  Logout
+                </Button>
               </Grid.Column>
             </Grid.Row>
           </Grid>
diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 037118a..846e8f0 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -4,7 +4,15 @@ import { connect } from "react-redux";
 import { RemoteService } from "../../../remote";
 
 const DeleteModal = (props) => (
-  <Modal trigger={<Button color="red">Remove</Button>} closeIcon>
+  <Modal
+    trigger={
+      <Button icon labelPosition="left" inverted color="red">
+        <Icon name="trash alternate" />
+        Delete device
+      </Button>
+    }
+    closeIcon
+  >
     <Header icon="archive" content="Are you sure ?" />
     <Modal.Actions>
       <Button color="red">
@@ -44,10 +52,11 @@ const SettingsForm = (props) => {
       </Form.Field>
       <Button
         onClick={() => props.saveFunction(values)}
-        color="blue"
+        color="green"
         type="submit"
       >
-        Save
+        <Icon name="checkmark" />
+        Save changes
       </Button>
     </Form>
   );

From d219716526512133a1431a1f88ba5d9efd97962f Mon Sep 17 00:00:00 2001
From: britea <andreabritesma@gmail.com>
Date: Fri, 17 Apr 2020 14:30:34 +0200
Subject: [PATCH 7/8] Fix data on adding room

---
 smart-hut/src/components/RoomModal.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/smart-hut/src/components/RoomModal.js b/smart-hut/src/components/RoomModal.js
index 36496b2..08f75d2 100644
--- a/smart-hut/src/components/RoomModal.js
+++ b/smart-hut/src/components/RoomModal.js
@@ -49,19 +49,11 @@ class RoomModal extends Component {
   }
 
   setInitialState() {
-    for (let key in this.initialState) {
-      if (this.initialState.hasOwnProperty(key)) {
-        //console.log(key + " -> " + this.initialState[key]);
-        this.setState({
-          key: this.initialState[key],
-        });
-      }
-    }
-    console.log(this.initialState);
-    //this.setState(state);
+    this.setState(this.initialState);
   }
 
   get type() {
+    console.log(this.props.id);
     return !this.props.id ? "new" : "modify";
   }
 

From 9c2a16732fb6f045635fd3942f59bbb11cbe01f8 Mon Sep 17 00:00:00 2001
From: britea <andreabritesma@gmail.com>
Date: Sat, 18 Apr 2020 16:26:12 +0200
Subject: [PATCH 8/8] Fixed bugs and Initial Scene Navbar

---
 smart-hut/src/components/RoomModal.js         |  1 -
 smart-hut/src/components/SceneModal.js        | 36 ++++----
 .../src/components/dashboard/DevicePanel.js   |  2 +-
 .../src/components/dashboard/ScenesPanel.js   |  1 -
 .../components/dashboard/devices/Device.js    | 16 ++--
 .../dashboard/devices/DeviceSettingsModal.js  |  5 +-
 .../src/components/dashboard/devices/Light.js |  1 +
 smart-hut/src/remote.js                       | 75 +++++++++++++++
 smart-hut/src/store.js                        | 69 +++++++++++++-
 smart-hut/src/storeActions.js                 | 12 +++
 smart-hut/src/views/Dashboard.js              | 17 +++-
 smart-hut/src/views/ScenesNavbar.js           | 91 ++++++++++++++-----
 12 files changed, 266 insertions(+), 60 deletions(-)

diff --git a/smart-hut/src/components/RoomModal.js b/smart-hut/src/components/RoomModal.js
index 08f75d2..eabdb89 100644
--- a/smart-hut/src/components/RoomModal.js
+++ b/smart-hut/src/components/RoomModal.js
@@ -53,7 +53,6 @@ class RoomModal extends Component {
   }
 
   get type() {
-    console.log(this.props.id);
     return !this.props.id ? "new" : "modify";
   }
 
diff --git a/smart-hut/src/components/SceneModal.js b/smart-hut/src/components/SceneModal.js
index 4f4901d..9183a58 100644
--- a/smart-hut/src/components/SceneModal.js
+++ b/smart-hut/src/components/SceneModal.js
@@ -26,7 +26,7 @@ class SceneModal extends Component {
 
   get initialState() {
     return {
-      name: this.type === "new" ? "New Scene" : this.props.room.name,
+      name: this.type === "new" ? "New Scene" : this.props.scene.name,
       openModal: false,
     };
   }
@@ -40,40 +40,38 @@ class SceneModal extends Component {
   }
 
   addSceneModal = (e) => {
-    /*let data = {
-      // DATA HERE
-    };*/
-    // TODO CALL TO REMOTE SERVER TO ADD SCENE
-    /*this.props
-      .saveRoom(data, null)
+    let data = {
+      name: this.state.name,
+    };
+
+    this.props
+      .saveScene(data, null)
       .then(() => {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in creating room", err));*/
+      .catch((err) => console.error("error in creating room", err));
   };
 
   modifySceneModal = (e) => {
-    /*let data = {
-      // DATA HERE
-    };*/
-    // TODO CALL TO REMOTE SERVER TO MODIFY SCENE
-    /*this.props
-      .saveRoom(data, this.props.id)
+    let data = {
+      name: this.state.name,
+    };
+
+    this.props
+      .saveScene(data, this.props.id)
       .then(() => {
         this.setInitialState();
         this.closeModal();
       })
-      .catch((err) => console.error("error in updating room", err));*/
+      .catch((err) => console.error("error in updating room", err));
   };
 
   deleteScene = (e) => {
-    // TODO CALL TO REMOTE SERVER TO DELETE SCENE
-    /*
     this.props
-      .deleteRoom(this.props.id)
+      .deleteScene(this.props.id)
       .then(() => this.closeModal())
-      .catch((err) => console.error("error in deleting room", err));*/
+      .catch((err) => console.error("error in deleting room", err));
   };
 
   changeSomething = (event) => {
diff --git a/smart-hut/src/components/dashboard/DevicePanel.js b/smart-hut/src/components/dashboard/DevicePanel.js
index 92cdb7c..2b45083 100644
--- a/smart-hut/src/components/dashboard/DevicePanel.js
+++ b/smart-hut/src/components/dashboard/DevicePanel.js
@@ -26,7 +26,7 @@ class DevicePanel extends Component {
         {this.props.devices.map((e, i) => {
           return (
             <Grid.Column key={i}>
-              <Device id={e.id} />
+              <Device tab={this.props.tab} id={e.id} />
             </Grid.Column>
           );
         })}
diff --git a/smart-hut/src/components/dashboard/ScenesPanel.js b/smart-hut/src/components/dashboard/ScenesPanel.js
index ca96e0b..0395e0e 100644
--- a/smart-hut/src/components/dashboard/ScenesPanel.js
+++ b/smart-hut/src/components/dashboard/ScenesPanel.js
@@ -7,7 +7,6 @@ import { Grid } from "semantic-ui-react";
 class ScenesPanel extends Component {
   constructor(props) {
     super(props);
-    console.log(this.props.activeScene);
   }
 
   render() {
diff --git a/smart-hut/src/components/dashboard/devices/Device.js b/smart-hut/src/components/dashboard/devices/Device.js
index 6ad0ac4..c019ddb 100644
--- a/smart-hut/src/components/dashboard/devices/Device.js
+++ b/smart-hut/src/components/dashboard/devices/Device.js
@@ -32,21 +32,21 @@ class Device extends React.Component {
   renderDeviceComponent() {
     switch (this.props.device.kind) {
       case "regularLight":
-        return <Light id={this.props.id} />;
+        return <Light tab={this.props.tab} id={this.props.id} />;
       case "sensor":
-        return <Sensor id={this.props.id} />;
+        return <Sensor tab={this.props.tab} id={this.props.id} />;
       case "motionSensor":
-        return <Sensor id={this.props.id} />;
+        return <Sensor tab={this.props.tab} id={this.props.id} />;
       case "buttonDimmer":
-        return <ButtonDimmer id={this.props.id} />;
+        return <ButtonDimmer tab={this.props.tab} id={this.props.id} />;
       case "knobDimmer":
-        return <KnobDimmer id={this.props.id} />;
+        return <KnobDimmer tab={this.props.tab} id={this.props.id} />;
       case "smartPlug":
-        return <SmartPlug id={this.props.id} />;
+        return <SmartPlug tab={this.props.tab} id={this.props.id} />;
       case "switch":
-        return <Switcher id={this.props.id} />;
+        return <Switcher tab={this.props.tab} id={this.props.id} />;
       case "dimmableLight":
-        return <Light id={this.props.id} />;
+        return <Light tab={this.props.tab} id={this.props.id} />;
       default:
         throw new Error("Device type unknown");
     }
diff --git a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
index 846e8f0..ec979d6 100644
--- a/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
+++ b/smart-hut/src/components/dashboard/devices/DeviceSettingsModal.js
@@ -36,12 +36,12 @@ const SettingsForm = (props) => {
   return (
     <Form>
       <Form.Field>
-        <label>New Name: </label>
+        <label>Edit Name: </label>
         <input
           autoComplete="off"
           name="name"
           onChange={handleInputChange}
-          value={values.name}
+          value={props.name}
           placeholder="Device name"
           // {this.props.device.name}
         />
@@ -112,6 +112,7 @@ class DeviceSettingsModal extends Component {
         <Modal.Header>Settings of {this.props.device.name}</Modal.Header>
         <Modal.Content>
           <SettingsForm
+            name={this.props.device.name}
             type={this.props.device.type}
             removeDevice={this.deleteDevice}
             saveFunction={this.updateDevice}
diff --git a/smart-hut/src/components/dashboard/devices/Light.js b/smart-hut/src/components/dashboard/devices/Light.js
index 5d01d89..5e8e53e 100644
--- a/smart-hut/src/components/dashboard/devices/Light.js
+++ b/smart-hut/src/components/dashboard/devices/Light.js
@@ -37,6 +37,7 @@ class Light extends Component {
   constructor(props) {
     super(props);
     this.state = { intensity: this.props.device.intensity, timeout: null };
+    console.log(this.props);
 
     this.iconOn = "/img/lightOn.svg";
     this.iconOff = "/img/lightOff.svg";
diff --git a/smart-hut/src/remote.js b/smart-hut/src/remote.js
index a0e429f..f2b0555 100644
--- a/smart-hut/src/remote.js
+++ b/smart-hut/src/remote.js
@@ -271,6 +271,23 @@ export const RemoteService = {
     };
   },
 
+  /**
+   * Fetches all scenes that belong to this user. This call does not
+   * populate the devices attribute in scenes.
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  fetchAllScenes: () => {
+    return (dispatch) => {
+      return Endpoint.get("/scene")
+        .then((res) => void dispatch(actions.scenesUpdate(res.data)))
+        .catch((err) => {
+          console.error("Fetch all scenes error", err);
+          throw new RemoteError(["Network error"]);
+        });
+    };
+  },
+
   /**
    * Fetches all devices in a particular room, or fetches all devices.
    * This also updates the devices attribute on values in the map rooms.
@@ -290,6 +307,25 @@ export const RemoteService = {
     };
   },
 
+  /**
+   * Fetches all devices in a particular scene, or fetches all devices.
+   * This also updates the devices attribute on values in the map scenes.
+   * @param {Number} sceneId the scene to which fetch devices
+   *   from, null to fetch from all scenes
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  fetchStates: (sceneId) => {
+    return (dispatch) => {
+      return Endpoint.get(`/scene/${sceneId}/states`)
+        .then((res) => void dispatch(actions.statesUpdate(sceneId, res.data)))
+        .catch((err) => {
+          console.error(`Fetch devices sceneId=${sceneId} error`, err);
+          throw new RemoteError(["Network error"]);
+        });
+    };
+  },
+
   /**
    * Creates/Updates a room with the given data
    * @param {String} data.name the room's name,
@@ -316,6 +352,28 @@ export const RemoteService = {
     };
   },
 
+  /**
+   * Creates/Updates a scene with the given data
+   * @param {String} data.name the scene's name,
+   * @param {Number|null} sceneId the scene's id if update, null for creation
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  saveScene: (data, sceneId = null) => {
+    return (dispatch) => {
+      data = {
+        name: data.name,
+      };
+
+      return (sceneId
+        ? Endpoint.put(`/scene/${sceneId}`, {}, data)
+        : Endpoint.post(`/scene`, {}, data)
+      )
+        .then((res) => void dispatch(actions.sceneSave(res.data)))
+        .catch(parseValidationErrors);
+    };
+  },
+
   /**
    * Creates/Updates a device with the given data. If
    * data.id is truthy, then a update call is performed,
@@ -496,6 +554,23 @@ export const RemoteService = {
     };
   },
 
+  /**
+   * Deletes a scene
+   * @param {Number} sceneId the id of the scene to delete
+   * @returns {Promise<Undefined, RemoteError>} promise that resolves to void and rejects
+   *  with user-fiendly errors as a RemoteError
+   */
+  deleteScene: (sceneId) => {
+    return (dispatch) => {
+      return Endpoint.delete(`/scene/${sceneId}`)
+        .then((_) => dispatch(actions.sceneDelete(sceneId)))
+        .catch((err) => {
+          console.warn("Scene deletion error", err);
+          throw new RemoteError(["Network error"]);
+        });
+    };
+  },
+
   /**
    * Deletes a device
    * @param {Device} device the device to delete
diff --git a/smart-hut/src/store.js b/smart-hut/src/store.js
index e8f0d83..984c5a3 100644
--- a/smart-hut/src/store.js
+++ b/smart-hut/src/store.js
@@ -38,6 +38,35 @@ function reducer(previousState, action) {
     }
   };
 
+  const createOrUpdateScene = (scene) => {
+    if (!newState.scenes[scene.id]) {
+      newState = update(newState, {
+        scenes: { [scene.id]: { $set: { ...scene, states: new Set() } } },
+      });
+    } else {
+      newState = update(newState, {
+        scenes: {
+          [scene.id]: {
+            name: { $set: scene.name },
+          },
+        },
+      });
+    }
+
+    if (newState.pendingJoins.scenes[scene.id]) {
+      newState = update(newState, {
+        pendingJoins: { scenes: { $unset: [scene.id] } },
+        scenes: {
+          [scene.id]: {
+            states: {
+              $add: [...newState.pendingJoins.scenes[scene.id]],
+            },
+          },
+        },
+      });
+    }
+  };
+
   const updateDeviceProps = (device) => {
     // In some updates the information regarding a device is incomplete
     // due to a fault in the type system and JPA repository management
@@ -63,6 +92,13 @@ function reducer(previousState, action) {
         createOrUpdateRoom(room);
       }
       break;
+    case "SCENES_UPDATE":
+      newState = previousState;
+      console.log(action.scenes);
+      for (const scene of action.scenes) {
+        createOrUpdateScene(scene);
+      }
+      break;
     case "DEVICES_UPDATE":
       change = null;
 
@@ -156,6 +192,10 @@ function reducer(previousState, action) {
       newState = previousState;
       createOrUpdateRoom(action.room);
       break;
+    case "SCENE_SAVE":
+      newState = previousState;
+      createOrUpdateScene(action.scene);
+      break;
     case "DEVICE_SAVE":
       change = {
         devices: { [action.device.id]: { $set: action.device } },
@@ -201,6 +241,30 @@ function reducer(previousState, action) {
         change.active = { activeRoom: { $set: -1 } };
       }
 
+      newState = update(previousState, change);
+      break;
+    case "SCENE_DELETE":
+      console.log("SCENE", action.sceneId);
+      if (!(action.sceneId in previousState.scenes)) {
+        console.warn(`Scene to delete ${action.sceneId} does not exist`);
+        break;
+      }
+
+      // This update does not ensure the consistent update of switchId/dimmerId properties
+      // on output devices connected to an input device in this room. Please manually request
+      // all devices again if consistent update is desired
+      change = { states: { $unset: [] } };
+
+      for (const id of previousState.scenes[action.sceneId].states) {
+        change.states.$unset.push(id);
+      }
+
+      change.scenes = { $unset: [action.sceneId] };
+
+      if (previousState.active.activeScene === action.sceneId) {
+        change.active = { activeScene: { $set: -1 } };
+      }
+
       newState = update(previousState, change);
       break;
     case "DEVICE_DELETE":
@@ -280,7 +344,6 @@ function reducer(previousState, action) {
 }
 
 const initState = {
-  errors: {},
   pendingJoins: {
     rooms: {},
     scenes: {},
@@ -299,9 +362,9 @@ const initState = {
   userInfo: null,
   /** @type {[integer]Room} */
   rooms: {},
-  /** @type {[integer]Scenes} */
+  /** @type {[integer]Scene} */
   scenes: {},
-  /** @type {[integer]Automations} */
+  /** @type {[integer]Automation} */
   automations: {},
   /** @type {[integer]Device} */
   devices: {},
diff --git a/smart-hut/src/storeActions.js b/smart-hut/src/storeActions.js
index e224b99..3afa192 100644
--- a/smart-hut/src/storeActions.js
+++ b/smart-hut/src/storeActions.js
@@ -17,6 +17,10 @@ const actions = {
     type: "ROOM_SAVE",
     room,
   }),
+  sceneSave: (scene) => ({
+    type: "SCENE_SAVE",
+    scene,
+  }),
   deviceSave: (device) => ({
     type: "DEVICE_SAVE",
     device,
@@ -40,6 +44,14 @@ const actions = {
     type: "ROOM_DELETE",
     roomId,
   }),
+  sceneDelete: (sceneId) => ({
+    type: "SCENE_DELETE",
+    sceneId,
+  }),
+  scenesUpdate: (scenes) => ({
+    type: "SCENES_UPDATE",
+    scenes,
+  }),
   deviceDelete: (deviceId) => ({
     type: "DEVICE_DELETE",
     deviceId,
diff --git a/smart-hut/src/views/Dashboard.js b/smart-hut/src/views/Dashboard.js
index f3c204f..11d6d7c 100644
--- a/smart-hut/src/views/Dashboard.js
+++ b/smart-hut/src/views/Dashboard.js
@@ -19,10 +19,22 @@ import { appActions } from "../storeActions";
 class Dashboard extends Component {
   constructor(props) {
     super(props);
+    this.state = this.initialState;
+    this.setInitialState();
 
     this.selectTab = this.selectTab.bind(this);
   }
 
+  get initialState() {
+    return {
+      activeTab: this.activeTab,
+    };
+  }
+
+  setInitialState() {
+    this.setState(this.initialState);
+  }
+
   get activeTab() {
     return this.props.activeTab;
   }
@@ -32,13 +44,14 @@ class Dashboard extends Component {
   }
 
   selectTab(e, { name }) {
+    this.setState({ activeTab: name });
     this.activeTab = name;
   }
 
   renderTab(tab) {
     switch (tab) {
       case "Devices":
-        return <DevicePanel />;
+        return <DevicePanel tab={this.state.activeTab} />;
       case "Scenes":
         return <ScenesPanel />;
       case "Automations":
@@ -148,7 +161,7 @@ class Dashboard extends Component {
             </Grid.Row>
             <Grid.Row color="black">
               <Grid.Column color="black">
-                <Navbar />
+                {this.renderNavbar(this.activeTab)}
               </Grid.Column>
             </Grid.Row>
             <Grid.Row>
diff --git a/smart-hut/src/views/ScenesNavbar.js b/smart-hut/src/views/ScenesNavbar.js
index 27862a6..74003ea 100644
--- a/smart-hut/src/views/ScenesNavbar.js
+++ b/smart-hut/src/views/ScenesNavbar.js
@@ -2,8 +2,8 @@ import React, { Component } from "react";
 import {
   Menu,
   Button,
-  Grid,
   Icon,
+  Grid,
   Responsive,
   Dropdown,
 } from "semantic-ui-react";
@@ -19,9 +19,12 @@ class ScenesNavbar extends Component {
     this.state = {
       editMode: false,
     };
-
+    console.log(this.props.scenes);
     this.toggleEditMode = this.toggleEditMode.bind(this);
     this.openCurrentModalMobile = this.openCurrentModalMobile.bind(this);
+    this.selectScene = this.selectScene.bind(this);
+
+    this.getScenes();
   }
 
   get activeItemScene() {
@@ -33,13 +36,21 @@ class ScenesNavbar extends Component {
   }
 
   get activeItemSceneName() {
-    if (this.props.activeScene === -1) return "Home";
+    if (this.props.activeScene === -1) return "Scene";
     return this.props.scenes[this.props.activeScene].name;
   }
 
+  getScenes() {
+    this.props
+      .fetchAllScenes()
+      .then(() => console.log(this.props.scenes))
+      .catch(console.error);
+  }
+
   openCurrentModalMobile() {
-    console.log(this.activeItem, this.props.roomModalRefs);
-    const currentModal = this.props.roomModalRefs[this.activeItem].current;
+    console.log(this.activeItemScene, this.props.sceneModalRefs);
+    const currentModal = this.props.sceneModalRefs[this.activeItemScene]
+      .current;
     currentModal.openModal();
   }
 
@@ -47,6 +58,10 @@ class ScenesNavbar extends Component {
     this.setState((prevState) => ({ editMode: !prevState.editMode }));
   }
 
+  selectScene(e, { id }) {
+    this.activeItemScene = id || -1;
+  }
+
   render() {
     return (
       <div style={{ background: "#1b1c1d!important", padding: "0 20px" }}>
@@ -66,18 +81,32 @@ class ScenesNavbar extends Component {
                   active={this.activeItemScene === -1}
                   onClick={this.selectScene}
                 >
-                  <Grid>
-                    <Grid.Row>
-                      <Grid.Column>
-                        <Icon name="home" size="small" />
-                      </Grid.Column>
-                      <Grid.Column>SCENES</Grid.Column>
-                    </Grid.Row>
-                  </Grid>
+                  SCENES
                 </Menu.Item>
-                {
-                  //INSERT LIST OF SCENES HERE
-                }
+
+                {Object.values(this.props.scenes).map((e, i) => {
+                  return (
+                    <Menu.Item
+                      id={e.id}
+                      key={i}
+                      name={e.name}
+                      active={this.activeItemScene === e.id}
+                      onClick={this.selectScene}
+                    >
+                      <Grid>
+                        <Grid.Row>
+                          <Grid.Column width={12}>{e.name}</Grid.Column>
+                          <Grid.Column floated="right">
+                            {this.state.editMode ? (
+                              <SceneModal id={e.id} />
+                            ) : null}
+                          </Grid.Column>
+                        </Grid.Row>
+                      </Grid>
+                    </Menu.Item>
+                  );
+                })}
+
                 <Menu.Item name="newM">
                   <Grid>
                     <Grid.Row centered name="new">
@@ -103,17 +132,33 @@ class ScenesNavbar extends Component {
                 >
                   <Grid>
                     <Grid.Row>
-                      <Grid.Column>
-                        <Icon name="home" size="small" />
-                      </Grid.Column>
                       <Grid.Column>Scene</Grid.Column>
                     </Grid.Row>
                   </Grid>
                 </Dropdown.Item>
 
-                {
-                  //INSERT LIST OF SCENES HERE
-                }
+                {Object.values(this.props.scenes).map((e, i) => {
+                  return (
+                    <Dropdown.Item
+                      id={e.id}
+                      key={i}
+                      name={e.name}
+                      active={this.activeItemScene === e.id}
+                      onClick={this.selectScene}
+                    >
+                      <Grid>
+                        <Grid.Row>
+                          <Grid.Column>{e.name}</Grid.Column>
+                        </Grid.Row>
+                      </Grid>
+                      <SceneModal
+                        ref={this.props.sceneModalRefs[e.id]}
+                        nicolaStop={true}
+                        id={e.id}
+                      />
+                    </Dropdown.Item>
+                  );
+                })}
               </Dropdown.Menu>
             </Dropdown>
           </Menu>
@@ -131,7 +176,7 @@ class ScenesNavbar extends Component {
                     onClick={this.openCurrentModalMobile}
                   >
                     <Icon name="pencil" size="small" />
-                    EDIT ROOM
+                    EDIT SCENE
                   </Button>
                 </Grid.Column>
               ) : null}