Commit graph

270 commits

Author SHA1 Message Date
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)
3b55a8ea78 Fixed style issues on scene share guest button 2020-05-06 11:28:27 +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
5c5988526b Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 93-guests-implement-scenes-2 2020-05-05 16:35:27 +02:00
bcb2105847 Merge branch '93-guests-implement-scenes' into 'dev'
Resolve "Guests: implement scenes"

Closes #93

See merge request sa4-2020/the-sanmarinoes/frontend!120
2020-05-05 16:33:21 +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)
bf77b676eb Removed current user from list of possible guests in guest modal 2020-05-04 18:22:21 +02:00
Claudio Maggioni (maggicl)
6454a369df Room remove image button fixed 2020-05-04 17:58:08 +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)
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)
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)
c7dc34eedc other minor fixes 2020-05-03 18:13:50 +02:00
Claudio Maggioni (maggicl)
0252870c70 fixed bug in deviceProps.js 2020-05-03 18:11:04 +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
a6fbd1a5d2 WIP 2020-05-02 20:50:34 +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
Claudio Maggioni (maggicl)
292a33e5bc Fixed updates from @christiancp 2020-05-01 11:18:25 +02:00
Claudio Maggioni (maggicl)
146aae1684 prettier run 2020-04-30 11:56:06 +02:00
Claudio Maggioni (maggicl)
697a348058 Merge branch '78-fix-light-problems-in-the-first-bach' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into dev-copy 2020-04-30 11:55:43 +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)
5b2bd7cc48 runned beautifier 2020-04-28 12:04:01 +02:00
Claudio Maggioni (maggicl)
b9be38d467 removed warnings 2020-04-28 12:02:46 +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
britea
7de6331f0f fix dimmable state 2020-04-28 10:59:47 +02:00
britea
0b840e7f8e fix thermostat 2020-04-28 10:48:07 +02:00
britea
c7c121182b fix dimmer scene state 2020-04-28 10:24:58 +02:00
britea
2eaa0e8345 thermostat fix 2020-04-27 19:24:21 +02:00
Christian Capeáns Pérez
cc23824a37 Automations basic stuff is working: create, get 2020-04-27 17:00:46 +02:00
britea
71d9731fc7 fixed device settings on scenes 2020-04-27 16:58:55 +02:00
Andrea Brites Marto
b7e17fc770 Merge branch 'dev' into 'apply'
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Curtain.js
2020-04-27 15:50:37 +02:00
britea
a7f05f0200 fixed scenes 2020-04-27 15:47:59 +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
Claudio Maggioni (maggicl)
29d2815a77 Curtains style fix 2020-04-27 14:14:11 +02:00
Fil Cesana
9ca3becd8d security camera icon added, I also did a restyling of the modal for the security camera: now it is centerd, and it occupies basically the entire scream, but leaving a fair margin on the for directions. Much better now, I think, but let me know in case. 2020-04-27 11:10:04 +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
b6a27195fe delete state 2020-04-25 18:27:09 +02:00
britea
2d9bdf63fb fixed problem in scene state 2020-04-25 18:23:40 +02:00
Jacob Salvi
d231ce7e84 fix to stateOrDevice 2020-04-25 17:52:50 +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
Christian Capeáns Pérez
48c0988063 Version 1 for the automations view done 2020-04-24 12:26:55 +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
Christian Capeáns Pérez
8d7f93dcbe fix new device 2020-04-23 11:36:44 +02:00
Christian Capeáns Pérez
268698a081 fix the wrong stuff in the bach I 2020-04-23 11:36:41 +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