-
);
}
diff --git a/smart-hut/src/components/HomeNavbar.js b/smart-hut/src/components/HomeNavbar.js
index 5bcafb5..651e1a0 100644
--- a/smart-hut/src/components/HomeNavbar.js
+++ b/smart-hut/src/components/HomeNavbar.js
@@ -1,6 +1,5 @@
import _ from "lodash";
import React, { Component } from "react";
-import { render } from "react-dom";
import {
Container,
Icon,
diff --git a/smart-hut/src/components/SelectIcons.js b/smart-hut/src/components/SelectIcons.js
index e9d23f6..f1a7994 100644
--- a/smart-hut/src/components/SelectIcons.js
+++ b/smart-hut/src/components/SelectIcons.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import { Button, Header, Image, Modal, Checkbox, Form, Grid, Input, Icon } from 'semantic-ui-react'
+import { Button, Grid } from 'semantic-ui-react'
export default class SelectIcons extends Component {
@@ -29,7 +29,6 @@ export default class SelectIcons extends Component {
['trophy', 'wrench', 'image', 'book', 'university', 'medkit'],
['paw', 'tree', 'utensils', 'male', 'female', 'life ring outline']];
- var colums = 0;
return (
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {this.state.openSettingsModal ?
+ d.id === this.state.settingsDeviceId)[0]}/> : ""
+ }
+ {
+ ds ?
+ ds.map((e, i) => {
+
+ return (
+
+
+
+ )
+ })
+ :
+ null
+ }
+ {
+ this.props.activeItem !== -1 ?
+
+
+
+ :
+ null
+ }
)
}
-}
-
-
-export default class DevicePanel extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- shownRoom: "All"
- }
- }
-
- render() {
- return (
- {this.props.device.name}
-
- {this.state.displayForm ? (
- ) : ("")}
-
- );
- return (
-
-
- {!this.state.displayForm ? (
- 
)
- :
-
- )
- :
- ×
- } - - this.props.edit.openModal(this.props.deviceId)}>
+
+
+
+
+ );
+ return (
+
+
+ {this.props.device.name}
+{this.props.device.name}
- {
+ } : this.onClickDevice}>
+
+
+ );
+
+ return (
+ {this.props.device.name}
+
+
+
+
+
+
);
+ const sensorForm = ({this.props.device.name}
+
+
+ {this.props.type === "new" ?
+ :
+ null
+ }
+
- {this.props.type == "new" ? "Add new room" : "Modify room" }
+ {this.props.type === "new" ? "Add new room" : "Modify room" }
+
- {this.props.type == "modify" ?
+ {this.props.type === "modify" ?
-
diff --git a/smart-hut/src/views/ConfirmForgotPassword.js b/smart-hut/src/views/ConfirmForgotPassword.js
index e364f0d..7de5e16 100644
--- a/smart-hut/src/views/ConfirmForgotPassword.js
+++ b/smart-hut/src/views/ConfirmForgotPassword.js
@@ -1,14 +1,7 @@
import React, { Component } from "react";
-import { render } from "react-dom";
import HomeNavbar from "./../components/HomeNavbar";
import {
- Container,
- Icon,
Image,
- Menu,
- Sidebar,
- Responsive,
- Header,
Divider,
Message,
Grid
diff --git a/smart-hut/src/views/ConfirmRegistration.js b/smart-hut/src/views/ConfirmRegistration.js
index 9bec496..b1c5652 100644
--- a/smart-hut/src/views/ConfirmRegistration.js
+++ b/smart-hut/src/views/ConfirmRegistration.js
@@ -1,14 +1,7 @@
import React, { Component } from "react";
-import { render } from "react-dom";
import HomeNavbar from "./../components/HomeNavbar";
import {
- Container,
- Icon,
Image,
- Menu,
- Sidebar,
- Responsive,
- Header,
Divider,
Message,
Grid
diff --git a/smart-hut/src/views/Dashboard.js b/smart-hut/src/views/Dashboard.js
index 30f36e0..f84c813 100644
--- a/smart-hut/src/views/Dashboard.js
+++ b/smart-hut/src/views/Dashboard.js
@@ -4,32 +4,50 @@ import Navbar from './Navbar'
import MyHeader from '../components/HeaderController'
import { call } from '../client_server';
-import {Button} from 'semantic-ui-react';
-import { Menu } from 'semantic-ui-react'
-import { Grid, Image, Icon } from 'semantic-ui-react'
+import { Grid } from 'semantic-ui-react'
+/*
+ rooms -> actual rooms
+ activeItem -> the current room in view
+ devices -> current device in current room view
+ id of Home is -1
+*/
+
export default class Dashboard extends Component{
constructor(props) {
super(props);
this.state = {
rooms: [],
- activeItem: "Home",
- tkn: this.props.tkn
+ activeItem: -1,
+ devices: [],
+ tkn: this.props.tkn,
};
this.addRoom = this.addRoom.bind(this);
+ this.deleteRoom = this.deleteRoom.bind(this);
+ this.addDevice = this.addDevice.bind(this);
this.handleItemClick = this.handleItemClick.bind(this);
}
componentDidMount() {
call.getAllRooms(this.props.tkn)
.then(res => {
- res.data.forEach((e) => {
- this.setState(state => ({
- rooms: state.rooms.concat([e])
- }));
- });
+ if (res.status === 200){
+ this.setState({
+ rooms: res.data
+ });
+ }
+ }).catch(err => {
+ console.log(err);
+ });
+ call.getAllDevices(this.props.tkn)
+ .then(res => {
+ if (res.status === 200) {
+ this.setState({
+ devices: res.data
+ });
+ }
}).catch(err => {
console.log(err);
});
@@ -38,7 +56,6 @@ export default class Dashboard extends Component{
addRoom(data) {
call.createRoom(data)
.then(res => {
- console.log(res);
if (res.status === 200 && res.data) {
this.setState(state => ({
rooms: state.rooms.concat([res.data])
@@ -49,30 +66,80 @@ export default class Dashboard extends Component{
});
};
- deleteRoom(id) {
-
+ deleteRoom() {
+ let data = {
+ id : this.state.activeItem
+ }
+ call.deleteRoom(data)
+ .then(res => {
+ //remove room in state.rooms
+ }).catch(err => {
+ console.log(err);
+ });
}
- handleItemClick(el) {
+ handleItemClick(id) {
+ // el -> obj of name and id
//da fare richiesta get della room e settare activeItem
+ this.setState({
+ activeItem: id
+ });
+ if ( id === -1) {
+ call.getAllDevices(this.props.tkn)
+ .then(res => {
+ if ( res.status === 200) {
+ this.setState({
+ devices: res.data
+ });
+ }
+ }).catch(err => {
+ console.log(err);
+ });
+ } else {
+ call.getAllDevicesByRoom(id, this.props.tkn)
+ .then(res => {
+ if (res.status === 200) {
+ console.log(res.data);
+ this.setState({
+ devices: res.data
+ });
+ }
+ }).catch(err => {
+ console.log(err);
+ });
+ }
}
-
+
+ addDevice(data) {
+ data.params["roomId"] = this.state.activeItem;
+ call.devicePost(data, this.props.tkn)
+ .then(res => {
+ this.setState(state => ({
+ devices: state.devices.concat([res.data])
+ }));
+ return this.state.devices;
+ }).catch(err => {
+
+ });
+ }
+
+
render () {
return(
Select an icon:
-
+
+ The message will return in 2s
+
+
+
- Hey what are you doing here? - Go back to our homepage -
-
+
+
+ 404
+
+
+
+
+ 404 Page Not Found
+
+
+
+
+
+
+
+
)
}
}
\ No newline at end of file
diff --git a/smart-hut/src/views/Home.js b/smart-hut/src/views/Home.js
index 3566a33..2d03a91 100644
--- a/smart-hut/src/views/Home.js
+++ b/smart-hut/src/views/Home.js
@@ -4,7 +4,6 @@ import HomeNavbar from './../components/HomeNavbar';
import {
Button,
Container,
- Divider,
Grid,
Header,
Icon,
@@ -70,7 +69,6 @@ class DesktopContainer extends Component {
render() {
const { children } = this.props
- const { fixed } = this.state
return (
+ Hey what are you doing here? + Looks like you are lost, this room does not exist. +
+