Commit graph

160 commits

Author SHA1 Message Date
Christian Capeáns Pérez
fa4bae7c10 Conditions to automations done (not connected to backend). I followed the same structure as in triggers 2020-05-15 20:57:42 +02:00
c67f2e4707 Beautifier fix 2020-05-12 15:18:33 +02:00
britea
9c89a2ea99 fixed another duplication 2020-05-10 23:28:20 +02:00
Andrea Brites Marto
1a3b631062 Merge branch '112-remove-possibility-to-reselect-a-device-already-added-to-a-scene' into 'dev'
fixed add states daoes not show states already in scene

Closes #112

See merge request sa4-2020/the-sanmarinoes/frontend!143
2020-05-10 11:05:24 +02:00
britea
7df52334ff fixed add states daoes not show states already in scene 2020-05-10 11:00:56 +02:00
957434ece5 Sonarqube fixes 2020-05-08 23:19:58 +02:00
0205ad3fd2 fixed Curtains.css 2020-05-08 23:00:11 +02:00
b27c6a3f51 Fixed bugs in automation fast update 2020-05-08 16:03:42 +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
e5426fa790 Added smooth temperature gradient 2020-05-08 15:37:01 +02:00
38425b8d68 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 103-temperature-sensor-color-circle-change-with-temperature-value 2020-05-08 15:21:49 +02:00
britea
4688995d12 fix apply scene 2020-05-08 14:55:26 +02:00
britea
d1cd93afe5 apply scene in host 2020-05-08 13:45:13 +02:00
Fil Cesana
74bccad636 added: icons for curtains and thermostat, all links in the footer now work, centered the toggle for the videocam component - also, I do not know if it was already merged, but the modal now looks better (I hope) 2020-05-07 13:13:02 +02:00
Nicola Brunner
bb91bb1ee2 fixed warning message in device panel thanks to andrea 2020-05-07 09:51:38 +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
Christian Capeáns Pérez
6c1e309ce4 Color of the temperature sensor changes with the temperature value (up to 20 degrees is green, from 20 to 30 is yellow and from 30 on is red) 2020-05-06 18:42:58 +02:00
b61148b24a Merge branch '104-creation-of-a-switch-error-message-if-no-light-selected' into 'dev'
found NewDevice class

Closes #104

See merge request sa4-2020/the-sanmarinoes/frontend!130
2020-05-06 15:55:04 +02:00
8414813070 found NewDevice class 2020-05-06 15:51:26 +02:00
717734fecb Merge branch 'fix-brunny' into 'dev'
fix di brunner

See merge request sa4-2020/the-sanmarinoes/frontend!129
2020-05-06 13:47:46 +02:00
Nicola Brunner
bf8e822fc7 modified signup, uniformed message if no scene, device or hosts 2020-05-06 13:43:07 +02:00
Claudio Maggioni (maggicl)
194e502578 Added label to share cameras button and other minor fixes 2020-05-06 11:13:17 +02:00
bb16d5c475 Done 1 read scene part 2020-05-05 17:04:53 +02:00
britea
246fdb1de8 points 2,3,4 2020-05-05 15:53:07 +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)
9f4bc21fa8 Fixed curtains creation default name 2020-05-04 14:38:18 +02:00
61430bb42e Merge branch 'dev' into '72-7-users-can-invite-guests'
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Device.js
2020-05-04 12:03:28 +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)
c7dc34eedc other minor fixes 2020-05-03 18:13:50 +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)
f6f46918c6 Fixed warning and merge in thermostats 2020-05-03 16:37:04 +02:00
britea
65756d0dc9 firx videocamera turn on/off 2020-05-03 14:39:44 +02:00
Claudio Maggioni (maggicl)
74a5e49776 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 72-7-users-can-invite-guests 2020-05-02 22:46:40 +02:00
Claudio Maggioni (maggicl)
9b2253b161 Guest selection panel working 2020-05-02 22:37:20 +02:00
britea
9537c12978 fix devices 2020-05-02 17:02:50 +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)
518760e925 Thermostats fixed (for scenes) 2020-05-02 13:58:02 +02:00
Claudio Maggioni (maggicl)
d49d6361ef Thermostats fixed 2020-05-02 11:11:21 +02:00
3af3b85aa9 Merge branch 'automations-fix' into 'dev'
Automations fix

See merge request sa4-2020/the-sanmarinoes/frontend!109
2020-05-01 20:10:54 +02:00
Claudio Maggioni (maggicl)
ac1bcdbc29 More fixes on automations 2020-05-01 20:07:37 +02:00
britea
6db8e928f1 fixed scenes, add multiple states 2020-05-01 19:55:08 +02:00
Claudio Maggioni (maggicl)
96184c76c9 Fixing automations and ui in general 2020-05-01 16:42:42 +02:00
Claudio Maggioni (maggicl)
52befca126 Fixed videocamera 2020-05-01 11:45:19 +02:00