Commit graph

367 commits

Author SHA1 Message Date
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
Matteo Omenetti
e1b90dab16 Merge branch 'header-controller-mobile' into 'dev'
mobile version of the header controller now working, I installed 'yarn add...

See merge request sa4-2020/the-sanmarinoes/frontend!56
2020-03-24 14:21:45 +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
a4188a15a4 Merge branch '34-cicd' into 'dev'
Modified the pipeline so that only the master and dev branch have to do the deploy

Closes #34

See merge request sa4-2020/the-sanmarinoes/frontend!55
2020-03-23 22:56:54 +01:00
77a2502be9 Implemented websocket connection with backend on sensors 2020-03-23 22:45:13 +01:00
1b86f6caa4 Merge branch 'beautification' into 'dev'
Added auto-beautifier

See merge request sa4-2020/the-sanmarinoes/frontend!53
2020-03-23 21:32:40 +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
1f3cfb6662 Merge branch '53-room-creation-inputs-not-working' into 'dev'
Resolve "Room creation inputs not working"

Closes #53

See merge request sa4-2020/the-sanmarinoes/frontend!52
2020-03-23 21:05:52 +01:00
5d3a6fe99e Fixed device name input 2020-03-23 21:03:16 +01:00
Matteo Omenetti
557d18dfc1 Merge branch '52-added-switches-creation-and-updates' into 'dev'
addes switches creation and update

Closes #52

See merge request sa4-2020/the-sanmarinoes/frontend!51
2020-03-23 19:11:46 +01:00
britea
f579ea80fe addes switches creation and update 2020-03-23 19:08:31 +01:00
Matteo Omenetti
8b49bdfbb7 Merge branch '51-added-update-dimmablelight' into 'dev'
added update for dimmableLights

Closes #51

See merge request sa4-2020/the-sanmarinoes/frontend!50
2020-03-23 16:04:14 +01:00
britea
045742d68e added update for dimmableLights 2020-03-23 13:22:30 +01:00
950908ef07 Merge branch '46-enable-deploy-stage-only-on-protected-branches' into 'dev'
Resolve "Enable deploy stage only on protected branches"

Closes #46

See merge request sa4-2020/the-sanmarinoes/frontend!46
2020-03-23 11:59:44 +01:00
Matteo Omenetti
52b1e12d73 Merge branch '48-add-update-lights' into 'dev'
added update on lights

Closes #48

See merge request sa4-2020/the-sanmarinoes/frontend!49
2020-03-23 10:21:35 +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
Matteo Omenetti
d4cec8a1fc Merge branch '47-fixed-bugs' into 'dev'
fixed bugs and cleaned code

Closes #47

See merge request sa4-2020/the-sanmarinoes/frontend!48
2020-03-22 18:12:19 +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
Jacob Salvi
50639e9655 Modified the pipeline so that only the master and dev branch have to do the deploy 2020-03-21 15:45:38 +01:00
Jacob Salvi
09d52fbd1c Modified the pipeline so that only the master and dev branch have to do the deploy 2020-03-21 15:34:28 +01:00
84c963b559 Merge branch '37-nav-resp' into 'dev'
Resolve "nav-resp"

Closes #37

See merge request sa4-2020/the-sanmarinoes/frontend!39
2020-03-21 14:55:56 +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
37506df76b Merge branch '404' into 'dev'
Resolve "404"

Closes #42

See merge request sa4-2020/the-sanmarinoes/frontend!45
2020-03-21 14:19:19 +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
f69ad0c5f5 Merge branch 'minor-issues+instruction-page' into 'dev'
Minor issues+instruction page

See merge request sa4-2020/the-sanmarinoes/frontend!43
2020-03-21 13:52:20 +01:00
Fil Cesana
7d78287379 resolved conflicts 2020-03-21 13:38:34 +01:00
8ac12ac8bf Merge branch '43-frontend-device-with-backend' into 'dev'
initial setup for device with backend

Closes #43

See merge request sa4-2020/the-sanmarinoes/frontend!42
2020-03-21 00:00:19 +01:00
britea
8b3200f639 initial setup for device with backend 2020-03-20 18:42:38 +01:00
4c15df7058 Merge branch '41-fix-all-warnings-and-clean-code' into 'dev'
fix all warnings and cleaned code

Closes #41

See merge request sa4-2020/the-sanmarinoes/frontend!40
2020-03-19 12:14: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
c5a59dbe7d Merge branch '32-finish-dashboard' into 'dev'
Resolve "Finish Dashboard"

Closes #32

See merge request sa4-2020/the-sanmarinoes/frontend!38
2020-03-18 16:03:10 +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
7faa63e484 Merge branch '40-re-fix-navbar-and-devicepanel' into 'dev'
re-fix navbar and device panel

Closes #40

See merge request sa4-2020/the-sanmarinoes/frontend!37
2020-03-18 13:35:05 +01:00
britea
07edc884b9 re-fix navbar and device panel 2020-03-18 13:20:01 +01:00
50bc259990 Merge branch '39-fix-navbar-and-devicepanel' into 'dev'
fix navbar and devicePanel

Closes #39

See merge request sa4-2020/the-sanmarinoes/frontend!36
2020-03-18 13:03:10 +01:00
britea
7a80e0562b fix navbar and devicePanel 2020-03-18 12:46:28 +01:00