|
|
a09b1dac57
|
Merge branch 'curtains-fix' into 'dev'
Curtains style fix
See merge request sa4-2020/the-sanmarinoes/frontend!96
|
2020-04-27 14:14:32 +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 |
|
Andrea Brites Marto
|
a54df637cd
|
Merge branch '82-scene-states-update' into 'dev'
Resolve "scene-states-update"
Closes #82
See merge request sa4-2020/the-sanmarinoes/frontend!94
|
2020-04-25 19:03:41 +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 |
|
Andrea Brites Marto
|
a3eff85149
|
Merge branch 'helpWithBackend' into 'dev'
Help with backend
See merge request sa4-2020/the-sanmarinoes/frontend!93
|
2020-04-25 14:50:07 +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 |
|
|
|
2c3272a6a8
|
Merge branch 'camera-fix' into 'dev'
Added backend source URL for camera
See merge request sa4-2020/the-sanmarinoes/frontend!92
|
2020-04-23 17:22:41 +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 |
|
Andrea Brites Marto
|
a097ee447c
|
Merge branch '81-fix-on-security-camera' into 'dev'
fix security camera
Closes #81
See merge request sa4-2020/the-sanmarinoes/frontend!91
|
2020-04-23 11:43:03 +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
|
cdf0f88cd9
|
Merge branch 'dashboard-videocamera' into 'dev'
Dashboard videocamera
See merge request sa4-2020/the-sanmarinoes/frontend!86
|
2020-04-22 16:37:29 +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 |
|
|
|
df1f753785
|
Merge branch '80-fix-editname-device' into 'dev'
fixed edit name on devices
Closes #80
See merge request sa4-2020/the-sanmarinoes/frontend!90
|
2020-04-21 16:35:20 +02:00 |
|
britea
|
3b67e57f1a
|
fixed edit name on devices
|
2020-04-21 16:18:05 +02:00 |
|
Matteo Omenetti
|
77f7abed92
|
Merge branch '79-addscene-getscenestates' into 'dev'
Able to add scenes and get scenes in a right way
Closes #79
See merge request sa4-2020/the-sanmarinoes/frontend!89
|
2020-04-21 15:02:25 +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 |
|
