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 |
|
|
|
50e53e6fe9
|
Added auto-beautifier
|
2020-03-23 21:21:15 +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 |
|
christiancp
|
182e1d6a48
|
Almost all the devices in the dashboard are implemented, along with the settings and add new device feature
|
2020-03-15 16:40:54 +01:00 |
|
britea
|
29dccdd21c
|
fix and update Dashboard
|
2020-03-14 15:48:33 +01:00 |
|
Nicola Brunner
|
1a55fc7804
|
Add room feature completed
|
2020-03-14 15:25:55 +01:00 |
|
