Commit graph

54 commits

Author SHA1 Message Date
c67f2e4707 Beautifier fix 2020-05-12 15:18:33 +02:00
dbc6223954 Fixed git merge sentience 2020-05-08 15:47:18 +02:00
e5bf0dbd83 Prettier reformat 2020-05-08 15:45:08 +02:00
3e53f11da0 Merge branch 'dev' into '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device'
# Conflicts:
#   smart-hut/src/store.js
2020-05-08 15:42:09 +02:00
britea
d1cd93afe5 apply scene in host 2020-05-08 13:45:13 +02:00
Christian Capeáns Pérez
78f6e508ec Check values for different types of sensors when creating a trigger for an automation 2020-05-06 21:36:32 +02:00
bb16d5c475 Done 1 read scene part 2020-05-05 17:04:53 +02:00
britea
bbd8074732 added option to use external temperature sensor 2020-05-04 19:42:13 +02:00
Claudio Maggioni (maggicl)
94ef7ef558 Scene copy implemented 2020-05-04 16:09:56 +02:00
Claudio Maggioni (maggicl)
5fac9890a6 Added icons to scenes 2020-05-04 15:08:17 +02:00
Claudio Maggioni (maggicl)
cfe1f35226 Deletion propagation implemented 2020-05-04 11:57:42 +02:00
Claudio Maggioni (maggicl)
c145be02b4 Lights can be modified by a guest 2020-05-04 11:13:19 +02:00
Claudio Maggioni (maggicl)
770469ade3 Socket update handling done except deletion messages, currently not implemented in the server side 2020-05-03 19:51:00 +02:00
Claudio Maggioni (maggicl)
3014b73323 Device guest view implemented 2020-05-03 18:09:53 +02:00
Claudio Maggioni (maggicl)
c95f7a95f7 Fixes to Device in preparation to use in Hosts tab 2020-05-03 17:18:34 +02:00
Claudio Maggioni (maggicl)
9b2253b161 Guest selection panel working 2020-05-02 22:37:20 +02:00
Claudio Maggioni (maggicl)
091ab50c0e WIP 2020-05-02 16:40:29 +02:00
c5e1e1bd8d added actions without working code 2020-05-02 15:30:10 +02:00
43615ba3b1 Host should work, cannot solve an error 2020-05-02 15:30:10 +02:00
Claudio Maggioni (maggicl)
8b1a7d4b20 Cleaned logs across repository 2020-05-02 14:51:31 +02:00
Claudio Maggioni (maggicl)
ac1bcdbc29 More fixes on automations 2020-05-01 20:07:37 +02:00
Claudio Maggioni (maggicl)
292a33e5bc Fixed updates from @christiancp 2020-05-01 11:18:25 +02:00
1de7b9992e Merge branch '70-5-users-can-create-basic-automations' into 'dev'
Resolve "5. Users can create basic automations"

Closes #70

See merge request sa4-2020/the-sanmarinoes/frontend!104
2020-04-28 12:07:58 +02:00
Claudio Maggioni (maggicl)
b0b281263e fix 2020-04-28 11:56:34 +02:00
Christian Capeáns Pérez
835ac99a8e Automation deletion added 2020-04-28 11:39:38 +02:00
Christian Capeáns Pérez
cc23824a37 Automations basic stuff is working: create, get 2020-04-27 17:00:46 +02:00
britea
af0c157205 fixed update state 2020-04-27 15:20:48 +02:00
britea
c878702331 try to fix 2020-04-27 14:44:48 +02:00
britea
2a1cc0292c fixed many things 2020-04-26 13:38:54 +02:00
Jacob Salvi
cce1650bd9 scene apply preparations 2020-04-26 11:15:05 +02:00
Jacob Salvi
07f4a8ee43 scene apply preparations 2020-04-26 11:09:49 +02:00
britea
34f83c9cce Merge branch '82-scene-states-update' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into 82-scene-states-update 2020-04-25 19:00:56 +02:00
britea
b73206e07a fixed add state 2020-04-25 19:00:39 +02:00
Jacob Salvi
79afe780b3 idk how but delete works 2020-04-25 18:44:54 +02:00
britea
2d9bdf63fb fixed problem in scene state 2020-04-25 18:23:40 +02:00
britea
bd3a39181c fix states scenes 2020-04-25 17:46:04 +02:00
britea
0b4fefbd35 Able to add scenes and get scenes in a right way 2020-04-21 14:58:36 +02:00
britea
9c2a16732f Fixed bugs and Initial Scene Navbar 2020-04-18 16:26:12 +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
b03e6b1850 Added and Fixed Scenes and Automations Modal and Navbars 2020-04-15 15:54:30 +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)
0805d9d4d0 Redux websockets implemented 2020-04-12 17:46:16 +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