Commit graph

77 commits

Author SHA1 Message Date
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
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)
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
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
britea
7f70aeb828 fixed minor bugs 2020-03-25 13:55:52 +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
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
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