Commit graph

26 commits

Author SHA1 Message Date
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
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
christiancp
993f1432a0 some changes to make it work 2020-03-18 15:30:02 +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
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
Nicola Brunner
1a55fc7804 Add room feature completed 2020-03-14 15:25:55 +01:00
Nicola Brunner
5fd213f34c fix merge from dev 2020-03-13 15:25:44 +01:00
Nicola Brunner
953b1a609a navbar is starting to work 2020-03-13 15:21:33 +01:00
Fil Cesana
b6a8d9bf96 header controller, forgot password, confirm refgistration, new navabr 2020-03-13 14:43:31 +01:00
christiancp
465b96f30c dashboard almost done with device buttons 2020-03-09 13:52:27 +01:00
christiancp
bdf6b96098 Login and Home pages are done. Login is ready to handle the authentication 2020-02-27 10:42:13 +01:00