smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
408 commits 2 branches 3 tags 23 MiB
Commit graph

408 commits

This branch
This branch
All branches
Author SHA1 Message Date
britea
c2e5d55ed2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-12 15:48:34 +02:00
Claudio Maggioni
4eba936a1e Merge branch 'sonar-fix' into 'dev' 
Changed beautifier to eslint

See merge request sa4-2020/the-sanmarinoes/frontend!148
 2020-05-12 15:22:45 +02:00
Claudio Maggioni
c67f2e4707 Beautifier fix 2020-05-12 15:18:33 +02:00
Matteo Omenetti
87d82296ac Merge branch '115-configure-eslint-analysis-for-sonarqube' into 'dev' 
Resolve "Configure eslint analysis for sonarqube"

Closes #115

See merge request sa4-2020/the-sanmarinoes/frontend!147
 2020-05-11 14:58:41 +02:00
Andrea Mocci
19efeb22de Issue #115: Run code quality pipeline only on dev 2020-05-11 14:54:34 +02:00
Andrea Mocci
22d0ba078a Issue #115: Remove cypress config for eslint 2020-05-11 14:40:15 +02:00
Andrea Mocci
50ac55db8b Issue #115: Add eslint configuration, commands, and pipeline config 2020-05-11 14:29:14 +02:00
Andrea Brites Marto
a576632ef7 Merge branch '114-remove-duplications' into 'dev' 
Resolve "remove-duplications"

Closes #114

See merge request sa4-2020/the-sanmarinoes/frontend!146
 2020-05-10 23:55:50 +02:00
britea
bb11babc5b fixed other duplications 2020-05-10 23:50:59 +02:00
britea
9c89a2ea99 fixed another duplication 2020-05-10 23:28:20 +02:00
Andrea Brites Marto
bd0b4d79ea Merge branch '114-remove-duplications' into 'dev' 
wrong class name

Closes #114

See merge request sa4-2020/the-sanmarinoes/frontend!145
 2020-05-10 21:57:17 +02:00
britea
746e00baa7 wrong class name 2020-05-10 21:51:09 +02:00
Andrea Brites Marto
e3068cee6b Merge branch '114-remove-duplications' into 'dev' 
Resolve "remove-duplications"

Closes #114

See merge request sa4-2020/the-sanmarinoes/frontend!144
 2020-05-10 21:48:57 +02:00
britea
f6d5ea7853 file confirm 2020-05-10 21:43:30 +02:00
britea
c5fefe7ad6 removed sonarqube confirm duplication 2020-05-10 21:43:09 +02:00
britea
18e46b8e61 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-10 21:29:29 +02:00
Andrea Brites Marto
1a3b631062 Merge branch '112-remove-possibility-to-reselect-a-device-already-added-to-a-scene' into 'dev' 
fixed add states daoes not show states already in scene

Closes #112

See merge request sa4-2020/the-sanmarinoes/frontend!143
 2020-05-10 11:05:24 +02:00
britea
7df52334ff fixed add states daoes not show states already in scene 2020-05-10 11:00:56 +02:00
Claudio Maggioni
3ade526ed3 Merge branch 'sonar-fix' into 'dev' 
Sonarqube fixes

See merge request sa4-2020/the-sanmarinoes/frontend!142
 2020-05-08 23:20:21 +02:00
Claudio Maggioni
957434ece5 Sonarqube fixes 2020-05-08 23:19:58 +02:00
Claudio Maggioni
9dc193ef28 Merge branch 'sonar-fix' into 'dev' 
fixed Curtains.css

See merge request sa4-2020/the-sanmarinoes/frontend!141
 2020-05-08 23:00:57 +02:00
Claudio Maggioni
393e753b44 Merge branch 'dev' into 'sonar-fix' 
# Conflicts:
#   smart-hut/src/components/dashboard/devices/Curtains.css
 2020-05-08 23:00:44 +02:00
Claudio Maggioni
0205ad3fd2 fixed Curtains.css 2020-05-08 23:00:11 +02:00
Claudio Maggioni
64d0cc19f8 Merge branch 'sonar-fix' into 'dev' 
fixed Curtains.css

See merge request sa4-2020/the-sanmarinoes/frontend!140
 2020-05-08 22:51:05 +02:00
Claudio Maggioni
4bf865c5ae fixed Curtains.css 2020-05-08 22:50:42 +02:00
britea
7354eefb49 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-08 18:42:11 +02:00
Claudio Maggioni
0ec8dccb25 Merge branch '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device' into 'dev' 
Check values for different types of sensors when creating a trigger for an automation

Closes #106

See merge request sa4-2020/the-sanmarinoes/frontend!139
 2020-05-08 16:07:59 +02:00
Claudio Maggioni
b27c6a3f51 Fixed bugs in automation fast update 2020-05-08 16:03:42 +02:00
Claudio Maggioni
dbc6223954 Fixed git merge sentience 2020-05-08 15:47:18 +02:00
Claudio Maggioni
e5bf0dbd83 Prettier reformat 2020-05-08 15:45:08 +02:00
Claudio Maggioni
3e53f11da0 Merge branch 'dev' into '106-rangetrigger-values-must-be-validated-to-a-sensible-range-for-the-respective-device' 
# Conflicts:
#   smart-hut/src/store.js
 2020-05-08 15:42:09 +02:00
Claudio Maggioni
3132204872 Merge branch '103-temperature-sensor-color-circle-change-with-temperature-value' into 'dev' 
Resolve "temperature sensor - color circle change with temperature value"

Closes #103

See merge request sa4-2020/the-sanmarinoes/frontend!131
 2020-05-08 15:41:46 +02:00
Claudio Maggioni
e5426fa790 Added smooth temperature gradient 2020-05-08 15:37:01 +02:00
Claudio Maggioni
38425b8d68 Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/frontend into 103-temperature-sensor-color-circle-change-with-temperature-value 2020-05-08 15:21:49 +02:00
Andrea Brites Marto
122689c864 Merge branch '102-scene-apply-button-in-hosts-view-does-not-work' into 'dev' 
Resolve "Scene apply button in hosts view does not work"

Closes #102

See merge request sa4-2020/the-sanmarinoes/frontend!138
 2020-05-08 14:59:10 +02:00
britea
4688995d12 fix apply scene 2020-05-08 14:55:26 +02:00
britea
d1cd93afe5 apply scene in host 2020-05-08 13:45:13 +02:00
britea
de1ce9bbf2 Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-08 10:00:37 +02:00
Claudio Maggioni
c1898ffa6c Merge branch '100-background-image-for-rooms' into 'dev' 
Added the background image for romms

Closes #100

See merge request sa4-2020/the-sanmarinoes/frontend!137
 2020-05-07 22:41:51 +02:00
Luca Ponzanelli
953b385f8b Merge branch '111-setup-sonarqube-pipeline-for-development-branch' into 'dev' 
Resolve "Setup SonarQube pipeline for development branch"

Closes #111

See merge request sa4-2020/the-sanmarinoes/frontend!135
 2020-05-07 16:17:03 +02:00
Luca Ponzanelli
873a136c68 Issue #111: add sonarqube analysis 
- add sonar-scanner dev dependency
  - add sonar-scanner job in ci configuration
 2020-05-07 16:17:03 +02:00
Jacob Salvi
a82c4b2c77 Merge branch 'dev' into '100-background-image-for-rooms' 
# Conflicts:
#   smart-hut/src/components/RoomModal.js
 2020-05-07 15:35:44 +02:00
Jacob Salvi
697ed70ea9 trying to solve a merge conflict 2020-05-07 15:34:56 +02:00
Jacob Salvi
cc60ff06ee trying to solve a merge conflict 2020-05-07 15:33:50 +02:00
Andrea Brites Marto
26d1f22c04 Merge branch 'fil-small-fixes-02' into 'dev' 
added: icons for curtains and thermostat, all links in the footer now work,...

See merge request sa4-2020/the-sanmarinoes/frontend!134
 2020-05-07 13:22:22 +02:00
britea
f58872e09e Merge branch 'dev' of https://lab.si.usi.ch/sa4-2020/the-sanmarinoes/frontend into dev 2020-05-07 13:21:11 +02:00
Fil Cesana
74bccad636 added: icons for curtains and thermostat, all links in the footer now work, centered the toggle for the videocam component - also, I do not know if it was already merged, but the modal now looks better (I hope) 2020-05-07 13:13:02 +02:00
Andrea Brites Marto
1dd25968be Merge branch '105-room' into 'dev' 
Resolve "Room view with no devices is now bugged and tells the user to create a room"

Closes #105

See merge request sa4-2020/the-sanmarinoes/frontend!132
 2020-05-07 10:32:00 +02:00
Jacob Salvi
5e76bbfa2f Added the background image for romms 2020-05-07 09:58:49 +02:00
Nicola Brunner
bb91bb1ee2 fixed warning message in device panel thanks to andrea 2020-05-07 09:51:38 +02:00