britea
77070242c6
almost complete simulation panel
2020-05-27 12:04:16 +02:00
britea
22366cb7a2
fixed simulation panel
2020-05-26 17:20:56 +02:00
britea
3ca4abaf62
resolve conflicts
2020-05-26 13:46:06 +02:00
britea
066eb1535b
initial simulation panel
2020-05-26 13:45:06 +02:00
Nicola Brunner
5e996670f3
forse ora va
2020-05-26 13:40:03 +02:00
britea
8cdd66f6d4
Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil
2020-05-25 15:57:45 +02:00
Nicola Brunner
56bb2b892b
modal is now closing
2020-05-24 12:49:54 +02:00
britea
b25b319228
fixed thermostat trigger
2020-05-23 16:19:13 +02:00
britea
5dd2bdae14
fixed update branch
2020-05-23 16:13:20 +02:00
britea
a184333579
update branch
2020-05-23 16:11:25 +02:00
britea
747bd370cc
update branch
2020-05-23 16:10:31 +02:00
b179115c15
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into frontend-userstory1-fil
2020-05-22 00:04:35 +02:00
Nicola Brunner
ac1a15cd5b
beauty fixes
2020-05-21 22:02:49 +02:00
britea
e54b53147a
fix bugs eslint
2020-05-21 16:45:39 +02:00
britea
727a5c9081
fixed condition autmations
2020-05-21 16:13:47 +02:00
britea
3830c0004f
other eslint avoid
2020-05-19 16:25:05 +02:00
britea
00778d989f
avoided some eslint problems
2020-05-19 16:24:29 +02:00
britea
0d2a2e92ba
connected automation conditions to the backend
2020-05-19 16:23:30 +02:00
Fil Cesana
31c98fac49
simulation panel is finished.
2020-05-18 10:54:31 +02:00
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
britea
406d563f4f
fix sonar
2020-05-12 16:23:27 +02:00
britea
1a755be7fb
fix bug sonrqube
2020-05-12 16:09:59 +02:00
c67f2e4707
Beautifier fix
2020-05-12 15:18:33 +02:00
britea
bb11babc5b
fixed other duplications
2020-05-10 23:50:59 +02:00
britea
9c89a2ea99
fixed another duplication
2020-05-10 23:28:20 +02:00
britea
746e00baa7
wrong class name
2020-05-10 21:51:09 +02:00
britea
f6d5ea7853
file confirm
2020-05-10 21:43:30 +02:00
britea
c5fefe7ad6
removed sonarqube confirm duplication
2020-05-10 21:43:09 +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
Fil Cesana
06c7c07cf3
a first version of the simulation panel, I still need to fix some binors bugs, and to add the other devices. Also, in the ehader controller, I converted the toggle into a chebox, because otherwise it was bugging with tthe modal in a very weird way
2020-05-09 17:46:57 +02:00
Fil Cesana
c837a8156c
finally fixed the css problem with the videocamera modal, now styling the simulation panel. There is a very weird bug with the slider on the left side of the header controller which is somehow visible when the modal is open, I will keep it for the end
2020-05-09 09:57:04 +02:00
Fil Cesana
bf9919560a
simulation panel now opens, it still misses the content
2020-05-09 09:13:26 +02:00
Fil Cesana
367159e3cf
button added in the header
2020-05-09 08:45:27 +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
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
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
Jacob Salvi
a82c4b2c77
Merge branch 'dev' into '100-background-image-for-rooms'
...
# Conflicts:
# smart-hut/src/components/RoomModal.js
2020-05-07 15:35:44 +02:00
Jacob Salvi
697ed70ea9
trying to solve a merge conflict
2020-05-07 15:34:56 +02:00
Jacob Salvi
cc60ff06ee
trying to solve a merge conflict
2020-05-07 15:33:50 +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
Andrea Brites Marto
1dd25968be
Merge branch '105-room' into 'dev'
...
Resolve "Room view with no devices is now bugged and tells the user to create a room"
Closes #105
See merge request sa4-2020/the-sanmarinoes/frontend!132
2020-05-07 10:32:00 +02:00
Jacob Salvi
5e76bbfa2f
Added the background image for romms
2020-05-07 09:58:49 +02:00
