Commit graph

84 commits

Author SHA1 Message Date
britea
2d9bdf63fb fixed problem in scene state 2020-04-25 18:23:40 +02:00
Jacob Salvi
2d04439948 Merge branch '82-scene-states-update' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update
# Conflicts:
#	smart-hut/src/components/dashboard/devices/Light.js
2020-04-25 17:50:05 +02:00
Jacob Salvi
1e668f499d fix to stateOrDevice 2020-04-25 17:46:43 +02:00
britea
bd3a39181c fix states scenes 2020-04-25 17:46:04 +02:00
Jacob Salvi
b301c97212 fix to stateOrDevice 2020-04-25 17:45:22 +02:00
Jacob Salvi
fd5c28b1c9 stateOrDevice() added in various places 2020-04-25 17:27:56 +02:00
Jacob Salvi
7f9a42fb84 sceneState.kind 2020-04-25 16:47:53 +02:00
Jacob Salvi
12f64ffbc2 changes to various devices 2020-04-25 16:18:01 +02:00
Jacob Salvi
a4c13a2691 i am dumb 2020-04-25 15:44:02 +02:00
Jacob Salvi
b56b9a8260 added updateState to store 2020-04-25 15:43:27 +02:00
Jacob Salvi
1484026afd added updateState to store 2020-04-25 15:37:40 +02:00
Jacob Salvi
1f063aebb6 small fixes and clean up 2020-04-25 14:46:49 +02:00
Jacob Salvi
71bd9cecd5 small fixes and clean up 2020-04-25 13:53:55 +02:00
Jacob Salvi
272b0dc330 small fixes 2020-04-25 09:21:48 +02:00
britea
6ecfe9653d fix turn on/off thermostat 2020-04-24 23:34:01 +02:00
a15ec55bb4 Added backend source URL for camera 2020-04-23 17:19:21 +02:00
Christian Capeáns Pérez
3ca1f519b6 Connection frontend-backend for Curtains and Thermostat. Added button to handle off/on of thermostats 2020-04-23 16:55:44 +02:00
Jacob Salvi
e0dd8f1273 small fixes 2020-04-23 16:02:02 +02:00
Jacob Salvi
1d4945a6a2 small changes 2020-04-23 15:34:23 +02:00
britea
3fdd89e238 fix security camera 2020-04-22 20:14:18 +02:00
Matteo Omenetti
2f3ede238f Merge branch 'dev' into 'dashboard-videocamera'
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Device.js
2020-04-22 16:35:09 +02:00
Fil Cesana
f9d1d9d678 videocam connected to back end 2020-04-22 14:25:24 +02:00
Fil Cesana
840d5ab6a2 moved everyting in the right files, ready to work on the backend part. 2020-04-22 13:34:10 +02:00
Fil Cesana
509335a061 video component is finished and ready for those who want to be tested in the file light.js; tomorrow I will move everything back in Videocam.js (in devices) and with Andrea we will perform the connection with the backend. If you test it, enjoy the video I put in loop ;) 2020-04-21 16:44:41 +02:00
britea
3b67e57f1a fixed edit name on devices 2020-04-21 16:18:05 +02:00
britea
0b4fefbd35 Able to add scenes and get scenes in a right way 2020-04-21 14:58:36 +02:00
Fil Cesana
3443bc8530 video now plays in loop. muted, in a responsive way: still to do: modal, enlarge full screen, communication with the backend - lost quite a lot of time testing both Embed from semantic and the simple video tag, Embed would have been good since it acts as a youtube player, but certain important tags like autoplay, loop etc did not seem to work. Also added the button 'enlarge', toggle now automatically set to on 2020-04-20 16:19:21 +02:00
Fil Cesana
82d6576324 for the rebase, now you can find the code of the videocam under devices/Videocam.js 2020-04-18 17:45:35 +02:00
Fil Cesana
63d9063983 first version of the videocamera, temporarily under the device light.js, for testing 2020-04-18 17:40:05 +02:00
britea
9c2a16732f Fixed bugs and Initial Scene Navbar 2020-04-18 16:26:12 +02:00
Nicola Brunner
dc22c008d3 changed design things 2020-04-17 14:25:22 +02:00
britea
9430de90d0 back to previous settings device 2020-04-17 14:15:22 +02:00
Nicola Brunner
b3abffa5b7 made some design changes 2020-04-17 11:29:40 +02:00
Nicola Brunner
1330f3cfea 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 2020-04-16 18:20:22 +02:00
britea
f99a5d49ff fixed major bug 2020-04-16 17:07:56 +02:00
Claudio Maggioni (maggicl)
b070273c73 Fix to socket state reducer and state updated in devices that use circularinput 2020-04-16 15:58:56 +02:00
britea
56da195894 Fixed registration bug 2020-04-16 15:15:33 +02:00
britea
b03e6b1850 Added and Fixed Scenes and Automations Modal and Navbars 2020-04-15 15:54:30 +02:00
britea
3bc219c926 New style for tabs 2020-04-14 22:56:00 +02:00
britea
82c4f3ea57 Basic Tabs system 2020-04-14 14:58:03 +02:00
Claudio Maggioni (maggicl)
76d10ba431 Fixed tests for redux 2020-04-12 17:52:35 +02:00
Claudio Maggioni (maggicl)
a4b59dc922 Fixed updates on circular inputs 2020-04-11 22:47:47 +02:00
britea
b60a050a70 Refactor redux almost complete 2020-04-11 18:29:32 +02:00
Claudio Maggioni (maggicl)
ed68bebe8e WIP on final conversion to redux 2020-04-11 13:57:03 +02:00
Claudio Maggioni (maggicl)
ad54cae0e2 Removed client_server.js and refactored devices 2020-04-11 00:42:23 +02:00
Claudio Maggioni (maggicl)
b5cbad53d1 Fixed bugs on previous refactors 2020-04-10 23:13:23 +02:00
7b430045e7 WIP on room change 2020-04-10 17:52:02 +02:00
69a6cbae6d WIP on redux conversion for devices 2020-04-10 17:25:52 +02:00
britea
eead3694e6 Converting project to Redux store 2020-04-09 17:24:30 +02:00
britea
573ffe1661 fix devide default name 2020-03-26 11:11:44 +01:00