|
|
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 |
|
britea
|
d219716526
|
Fix data on adding room
|
2020-04-17 14:30:34 +02:00 |
|
Nicola Brunner
|
dc22c008d3
|
changed design things
|
2020-04-17 14:25:22 +02:00 |
|
britea
|
9430de90d0
|
back to previous settings device
|
2020-04-17 14:15:22 +02:00 |
|
Nicola Brunner
|
b3abffa5b7
|
made some design changes
|
2020-04-17 11:29:40 +02:00 |
|
Nicola Brunner
|
1239559f45
|
changed Home in navbar into House view as required by user story 1
|
2020-04-16 18:38:34 +02:00 |
|
Nicola Brunner
|
1330f3cfea
|
For edit device modal: added possibility to exit window without modifications (cross) | For Sensors: Now displays general device name and not specific device name in the icon
|
2020-04-16 18:20:22 +02:00 |
|
britea
|
f99a5d49ff
|
fixed major bug
|
2020-04-16 17:07:56 +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
|
56da195894
|
Fixed registration bug
|
2020-04-16 15:15:33 +02:00 |
|
britea
|
b03e6b1850
|
Added and Fixed Scenes and Automations Modal and Navbars
|
2020-04-15 15:54:30 +02:00 |
|
britea
|
3bc219c926
|
New style for tabs
|
2020-04-14 22:56:00 +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 |
|
britea
|
eead3694e6
|
Converting project to Redux store
|
2020-04-09 17:24:30 +02:00 |
|
|
|
bad5d04238
|
Fixed nasty error in Login
|
2020-04-09 14:48:24 +02:00 |
|
|
|
462cad0e53
|
Login and logout work on the new system. Nasty error on logout
|
2020-04-09 13:59:34 +02:00 |
|
|
|
c36d298f10
|
WIP on redux refactor: last commit before client_server.js removal
|
2020-04-07 14:49:49 +02:00 |
|
|
|
636ade0273
|
WIP on redux refactor
|
2020-04-07 12:46:55 +02:00 |
|
britea
|
573ffe1661
|
fix devide default name
|
2020-03-26 11:11:44 +01:00 |
|
|
|
c9b4f22896
|
Merge branch 'dev' into 'fix-mobile'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-26 10:27:37 +01:00 |
|
|
|
fab38d9ad0
|
fixed mobile
|
2020-03-26 10:26:43 +01:00 |
|
britea
|
054f4ad341
|
fixed minor bug on smartplugs
|
2020-03-26 09:51:25 +01:00 |
|
britea
|
7ce3cf1cb2
|
added reset smartplug
|
2020-03-26 09:36:00 +01:00 |
|
britea
|
5712483efb
|
fixed redirect reset password
|
2020-03-26 08:34:21 +01:00 |
|
britea
|
e5b5a2f903
|
fix-navbar
|
2020-03-26 00:15:02 +01:00 |
|
britea
|
a8c8de8bdc
|
fix device default name
|
2020-03-25 22:15:52 +01:00 |
|
britea
|
67496b11a0
|
btn-dimmer and knob-dimmer update
|
2020-03-25 19:58:19 +01:00 |
|
britea
|
ff090ad317
|
fixed switch and warnings
|
2020-03-25 17:20:53 +01:00 |
|
christiancp
|
7ef46e9a1d
|
fixed opacity in intensity light
|
2020-03-25 16:44:47 +01:00 |
|
christiancp
|
ab1e911ccd
|
Working on conflicts
|
2020-03-25 16:41:12 +01:00 |
|
christiancp
|
024e40deca
|
Restyle some devices and creation of both dimmers (button and knob).
|
2020-03-25 16:30:53 +01:00 |
|
Nicola Brunner
|
fba2321b55
|
new logo, image upload, image for background
|
2020-03-25 15:43:03 +01:00 |
|
britea
|
5d9d077b48
|
fixed dimmable light input
|
2020-03-25 14:34:55 +01:00 |
|
|
|
228ada3305
|
Merge branch '62-revise-docker-configuration-for-m1-deployment' into 'dev'
Fix backend url for dev server
Closes #62
See merge request sa4-2020/the-sanmarinoes/frontend!66
|
2020-03-25 14:14:38 +01:00 |
|
|
|
303ac1cfc3
|
fix
|
2020-03-25 14:13:59 +01:00 |
|
Matteo Omenetti
|
436f7c1bd5
|
Merge branch '63-fixed-minor-bugs' into 'dev'
fixed minor bugs
Closes #63
See merge request sa4-2020/the-sanmarinoes/frontend!65
|
2020-03-25 14:00:03 +01:00 |
|
britea
|
7f70aeb828
|
fixed minor bugs
|
2020-03-25 13:55:52 +01:00 |
|
|
|
ed14570546
|
Fixed Dockerfile and parametrized backend URL
|
2020-03-25 13:54:13 +01:00 |
|
britea
|
ec0de847db
|
added motion sensor update
|
2020-03-24 20:35:23 +01:00 |
|
britea
|
8dad01d633
|
switch and smart-plug update and fixed warnings
|
2020-03-24 18:17:04 +01:00 |
|
|
|
e81b5a9553
|
Merge branch 'password-successfully-reset-page' into 'dev'
confirm reset password page done
See merge request sa4-2020/the-sanmarinoes/frontend!57
|
2020-03-24 17:42:15 +01:00 |
|
Fil Cesana
|
733d2ee44f
|
fix
|
2020-03-24 17:37:05 +01:00 |
|
|
|
7928407259
|
Done real time output device updates
|
2020-03-24 17:08:19 +01:00 |
|
Nicola Brunner
|
580511ce6e
|
is prettier
|
2020-03-24 16:03:08 +01:00 |
|
Fil Cesana
|
b00f803670
|
confirm reset password page done
|
2020-03-24 15:57:22 +01:00 |
|
Nicola Brunner
|
10aeb75730
|
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into base64
|
2020-03-24 15:55:51 +01:00 |
|
Nicola Brunner
|
d147701129
|
fixed selected icons, base 64, icons di fil
|
2020-03-24 15:33:32 +01:00 |
|
|
|
745314466d
|
Merge branch '54-implement-updates-with-websocket-from-backend' into 'dev'
Resolve "Implement updates with websocket from backend"
Closes #54
See merge request sa4-2020/the-sanmarinoes/frontend!54
|
2020-03-24 14:38:49 +01:00 |
|
Fil Cesana
|
f00939a128
|
mobile version of the header controller now working, I installed 'yarn add react-device-detect', since it automatically modified the file package. json, neither of you need to install it, correct?
|
2020-03-24 10:10:49 +01:00 |
|
|
|
77a2502be9
|
Implemented websocket connection with backend on sensors
|
2020-03-23 22:45:13 +01:00 |
|
|
|
bca57e2a9b
|
Fixed and beautified merge
|
2020-03-23 21:30:20 +01:00 |
|
|
|
897d6705b0
|
Merge branch 'dev' into 'beautification'
# Conflicts:
# smart-hut/src/components/modalform.js
|
2020-03-23 21:26:07 +01:00 |
|
|
|
82924d6062
|
Beautified source code
|
2020-03-23 21:24:17 +01:00 |
|
|
|
5d3a6fe99e
|
Fixed device name input
|
2020-03-23 21:03:16 +01:00 |
|
britea
|
f579ea80fe
|
addes switches creation and update
|
2020-03-23 19:08:31 +01:00 |
|
britea
|
045742d68e
|
added update for dimmableLights
|
2020-03-23 13:22:30 +01:00 |
|
britea
|
d7c2e020bc
|
added update on lights
|
2020-03-23 02:17:13 +01:00 |
|
Matteo Omenetti
|
c6c62c51f2
|
Merge branch 'header-controller-fix' into 'dev'
header in dashboard: size, logo, fixed
See merge request sa4-2020/the-sanmarinoes/frontend!47
|
2020-03-22 23:40:48 +01:00 |
|
britea
|
c215daf44d
|
fixed bugs and cleaned code
|
2020-03-22 17:58:27 +01:00 |
|
Fil Cesana
|
c5100700a4
|
header in dashboard: size, logo, fixed
|
2020-03-21 16:06:18 +01:00 |
|
|
|
4f4e54e065
|
Merge branch 'dev' into '37-nav-resp'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-21 14:55:44 +01:00 |
|
Nicola Brunner
|
0de3b0257f
|
Done 4oh4 page
|
2020-03-21 14:05:11 +01:00 |
|
|
|
dd94a6aa30
|
Merge branch 'dev' into '37-nav-resp'
# Conflicts:
# smart-hut/src/views/Navbar.js
|
2020-03-21 13:56:54 +01:00 |
|
Fil Cesana
|
7d78287379
|
resolved conflicts
|
2020-03-21 13:38:34 +01:00 |
|
britea
|
8b3200f639
|
initial setup for device with backend
|
2020-03-20 18:42:38 +01:00 |
|
britea
|
e786288fa8
|
fix all warnings and cleaned code
|
2020-03-19 11:52:13 +01:00 |
|
Nicola Brunner
|
c6e483ea6c
|
done minor fixes responive navbar
|
2020-03-19 11:49:00 +01:00 |
|
Nicola Brunner
|
3360220669
|
more responsive than before ;)
|
2020-03-18 17:12:29 +01:00 |
|
Fil Cesana
|
1757c8e2d7
|
Instructions pages done, I will wait until the app is more or less completed before writing the actual instructions, for many thing may change along the way.
|
2020-03-18 16:35:42 +01:00 |
|
|
|
d7399abdea
|
Removed TODO
|
2020-03-18 15:49:33 +01:00 |
|
christiancp
|
993f1432a0
|
some changes to make it work
|
2020-03-18 15:30:02 +01:00 |
|
christiancp
|
cd12d5f69f
|
minor error fixed
|
2020-03-18 15:12:12 +01:00 |
|
Matteo Omenetti
|
e60c2ed45a
|
Merge branch 'dev' into '32-finish-dashboard'
# Conflicts:
# smart-hut/src/components/dashboard/DevicePanel.js
# smart-hut/src/components/dashboard/devices/Light.js
# smart-hut/src/components/dashboard/devices/styleComponents.js
# smart-hut/src/views/Dashboard.js
|
2020-03-18 15:06:27 +01:00 |
|
christiancp
|
70e5dc8017
|
change button color
|
2020-03-18 14:19:47 +01:00 |
|
christiancp
|
edf1706986
|
Add device feature finished
|
2020-03-18 14:18:37 +01:00 |
|
britea
|
07edc884b9
|
re-fix navbar and device panel
|
2020-03-18 13:20:01 +01:00 |
|
britea
|
7a80e0562b
|
fix navbar and devicePanel
|
2020-03-18 12:46:28 +01:00 |
|
christiancp
|
99f1e16927
|
Everything related to the settings is done
|
2020-03-17 23:24:40 +01:00 |
|
christiancp
|
744f1b5710
|
All the devices are implemented
|
2020-03-17 17:38:03 +01:00 |
|
|
|
707a5630fc
|
Merge branch '5-add-delete-or-modify-rooms' into 'dev'
Resolve "Add, Delete, or Modify rooms"
Closes #5
See merge request sa4-2020/the-sanmarinoes/frontend!31
|
2020-03-17 17:35:55 +01:00 |
|
|
|
22a7ba07cc
|
Merge remote-tracking branch 'origin/header-controller' into dev
|
2020-03-17 17:34:17 +01:00 |
|
Nicola Brunner
|
50b05fa22a
|
Added 404 images, finished modify in feature in navbar
|
2020-03-17 17:08:06 +01:00 |
|
britea
|
1fe78b824b
|
fixed login display and devices
|
2020-03-17 16:20:43 +01:00 |
|
Fil Cesana
|
c5dbf01394
|
changed text in homepage, add icons, instruction page still work in progress, changed logo headController
|
2020-03-17 15:06:40 +01:00 |
|
