Commit graph

75 commits

Author SHA1 Message Date
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
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
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
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
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
ff090ad317 fixed switch and warnings 2020-03-25 17:20:53 +01:00
Nicola Brunner
fba2321b55 new logo, image upload, image for background 2020-03-25 15:43:03 +01:00
britea
7f70aeb828 fixed minor bugs 2020-03-25 13:55:52 +01:00
britea
8dad01d633 switch and smart-plug update and fixed warnings 2020-03-24 18:17:04 +01:00
Fil Cesana
733d2ee44f fix 2020-03-24 17:37:05 +01:00
Fil Cesana
b00f803670 confirm reset password page done 2020-03-24 15:57:22 +01:00
82924d6062 Beautified source code 2020-03-23 21:24:17 +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
britea
c215daf44d fixed bugs and cleaned code 2020-03-22 17:58:27 +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
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
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