diff --git a/dev/package.json b/dev/package.json index fb98bd6..0dada5f 100644 --- a/dev/package.json +++ b/dev/package.json @@ -11,12 +11,12 @@ "start": "WDS=true npx webpack-dev-server" }, "dependencies": { - "@bthlabs/homehub-app": "1.3.0", - "@bthlabs/homehub-components": "1.3.0", - "@bthlabs/homehub-core": "1.3.0", - "@bthlabs/homehub-icons": "1.3.0", - "@bthlabs/homehub-iformicarium": "1.3.0", - "@bthlabs/homehub-tradfri": "1.3.0", + "@bthlabs/homehub-app": "1.4.0", + "@bthlabs/homehub-components": "1.4.0", + "@bthlabs/homehub-core": "1.4.0", + "@bthlabs/homehub-icons": "1.4.0", + "@bthlabs/homehub-iformicarium": "1.4.0", + "@bthlabs/homehub-tradfri": "1.4.0", "@babel/core": "7.7.2", "@babel/plugin-proposal-class-properties": "7.8.3", "@babel/preset-env": "7.7.1", diff --git a/dev/requirements-dev.txt b/dev/requirements-dev.txt index 952fc70..6fc2588 100644 --- a/dev/requirements-dev.txt +++ b/dev/requirements-dev.txt @@ -1,2 +1,2 @@ -r requirements.txt -aiohttp-devtools==0.13.1 +aiohttp-devtools==1.0.post0 diff --git a/dev/requirements.txt b/dev/requirements.txt index 8557fa7..57e52d0 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,3 +1,3 @@ -homehub_backend==1.3.0 -homehub_iformicarium==1.3.0 -homehub_tradfri==1.3.0 +homehub_backend==1.4.0 +homehub_iformicarium==1.4.0 +homehub_tradfri==1.4.0 diff --git a/dev/yarn.lock b/dev/yarn.lock index 6b69b29..97482e4 100644 --- a/dev/yarn.lock +++ b/dev/yarn.lock @@ -710,35 +710,35 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@bthlabs/homehub-app@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-app/-/homehub-app-1.3.0.tgz#d857b6528829292112f6efc37c03aa76ab5b0438" - integrity sha512-M0tC4bjWWJR/WeDq9iXJ4E13KKI2tp217wVgWoZfH07iE+bKv7nGRUVc8jXb7M88aHBoWgyggQeEhNFFcZ06xQ== +"@bthlabs/homehub-app@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-app/-/homehub-app-1.4.0.tgz#cd160f1b184e1c0aec03221365dd8a5127682539" + integrity sha512-ul41af1twFWE+07rikw/ud5PJqyECgT07EwYWpKreBsaHbA0O7/4vedKCTwcaCz3UZT813gQkVNsyqH4pPv1zg== -"@bthlabs/homehub-components@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-components/-/homehub-components-1.3.0.tgz#be3bd3ddcb485bb0cec3b377f8e9a5dfcea2455b" - integrity sha512-8VzaX2b2uEA65LGr865Hh+JJc4ZbJxicA/gNP2K+/2/I+QqtaA1GQD/SQQ7T3OIfUu9AxiL7rxoxwKm4j31oow== +"@bthlabs/homehub-components@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-components/-/homehub-components-1.4.0.tgz#4bedcad6abc6e344310bd4244d916c907e267924" + integrity sha512-JN0L3wawXTrFF/IhH6Trh64uBMj/jHDYryg1DRgTwfOTjpqT/WJAAaiDUUitHhiqadhrDo2NCx+/TEqpwalF9A== -"@bthlabs/homehub-core@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-core/-/homehub-core-1.3.0.tgz#7505361d760492c1971c2da3c689694688b9efb5" - integrity sha512-dnqTpA83hOVhCQdhQW13Vt6UdwBRsHWx/kmrHrVMrsyL6pZQhQ9I9SogN5YGoXuXKVDDT6X+SBOqqESOalNZJA== +"@bthlabs/homehub-core@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-core/-/homehub-core-1.4.0.tgz#440ef9a613b97c3d05c5c99327103674ca6f5406" + integrity sha512-Ih8Ddv84mUXiqooR1Xkby9kSMs5KRJ/a+vDqU+OdJSOObqNGhZ9DDhLHz9dtFVxzvqmokkMikPBfilejJnuBBg== -"@bthlabs/homehub-icons@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-icons/-/homehub-icons-1.3.0.tgz#4e3ba588dd6883484e37bf9ac10425fc81e3e5c8" - integrity sha512-jbnk9izy88iJZKfJvvwpvxgdoeadva1EwxkXhkcb12GHR1FzjP5L9CJBwP5qUt0coddw5DrQqURkICn3JWZtAg== +"@bthlabs/homehub-icons@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-icons/-/homehub-icons-1.4.0.tgz#6c94ece40efad70759df04435fd6efa9ffebfeb5" + integrity sha512-t+hs6/X+VuFiPHOqoKHUDqSTiF23Fs0ZBRRFkVUroWxYHr3lZCkBCRUN6ftCZ6qQ9GbuPeFTKrzAUSa++Zfu7g== -"@bthlabs/homehub-iformicarium@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-iformicarium/-/homehub-iformicarium-1.3.0.tgz#53465840430a99532616965ca7783a4103583a85" - integrity sha512-JRB6Bj8Cm3UqxkxjjUzHr6xiMtIdnri5/hDny4RVmGVWrgt6YSEdINnxnHKX00Rpvp5a6AxZtPzLsjlsuV/1wQ== +"@bthlabs/homehub-iformicarium@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-iformicarium/-/homehub-iformicarium-1.4.0.tgz#b7b725bc5d46485bebfaa17d8c608ee230a60168" + integrity sha512-kPEV/FL/hj/RgAumlw+doZVC28vNDcSwtyILUcswgRi1n/yYNMVBWpQB156GRxyIoo5/HoS1lW3wLOwqM5KfwQ== -"@bthlabs/homehub-tradfri@1.3.0": - version "1.3.0" - resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-tradfri/-/homehub-tradfri-1.3.0.tgz#2a8bf168a53200414282461046a3c8cef5708a75" - integrity sha512-KhI6z1/Dt61+auiWkqJgf2YUEvD5Fy1S8b+NLdCg2/8DoMsOcQFsHybiPXfJjp7dExLjhXgTFC9DPVeCBSYMqg== +"@bthlabs/homehub-tradfri@1.4.0": + version "1.4.0" + resolved "https://nexus.bthlabs.pl/repository/npm/@bthlabs/homehub-tradfri/-/homehub-tradfri-1.4.0.tgz#56c0931dfcb32628050f693654956c57e1524b43" + integrity sha512-uxTYR8FqSVbkSp4jMPWD1CJZcDYb/5EreFVM6cYAwQsyQq9lypp1FyVInlinxY91cDumCBS1N7tWSXvKaQhKBg== "@nodelib/fs.scandir@2.1.4": version "2.1.4" diff --git a/packages/homehub_app/package.json b/packages/homehub_app/package.json index 57d5ac2..f0bc405 100644 --- a/packages/homehub_app/package.json +++ b/packages/homehub_app/package.json @@ -1,6 +1,6 @@ { "name": "@bthlabs/homehub-app", - "version": "1.3.0", + "version": "1.4.0", "description": "BTHLabs HomeHub - Frontend Application", "main": "lib/index.js", "author": "BTHLabs (https://bthlabs.pl/)", @@ -20,9 +20,9 @@ "registry": "https://nexus.bthlabs.pl/repository/npm-hosted/" }, "peerDependencies": { - "@bthlabs/homehub-components": ">=1.3.0", - "@bthlabs/homehub-core": ">=1.3.0", - "@bthlabs/homehub-icons": ">=1.3.0", + "@bthlabs/homehub-components": ">=1.4.0,<2.0.0", + "@bthlabs/homehub-core": ">=1.4.0,<2.0.0", + "@bthlabs/homehub-icons": ">=1.4.0,<2.0.0", "prop-types": ">=15.7.2", "react": ">=16.11.0", "react-bootstrap": "1.0.1", @@ -35,12 +35,12 @@ "@babel/preset-env": "7.7.1", "@babel/preset-react": "7.7.0", "@bthlabs/eslint-config": "1.0.3", - "@bthlabs/homehub-components": ">=1.2.0", - "@bthlabs/homehub-core": ">=1.2.0", - "@bthlabs/homehub-icons": ">=1.2.0", + "@bthlabs/homehub-components": "1.4.0", + "@bthlabs/homehub-core": "1.4.0", + "@bthlabs/homehub-icons": "1.4.0", "@bthlabs/rango": "1.0.0", "@bthlabs/react-custom-popup": "1.0.3", - "@bthlabs/scss-webpack-plugin": "1.0.1", + "@bthlabs/scss-webpack-plugin": "1.0.3", "babel-eslint": "10.0.3", "babel-loader": "8.0.6", "classnames": "2.2.6", @@ -79,6 +79,7 @@ "redux-doctitle": "1.0.1", "regenerator-runtime": "0.13.5", "sass-loader": "8.0.2", + "sass": "^1.3.0", "string.prototype.replaceall": "1.0.5", "style-loader": "1.2.1", "webpack": "4.41.2", diff --git a/packages/homehub_app/scss/app.scss b/packages/homehub_app/scss/app.scss index 0fc6aeb..23324e8 100644 --- a/packages/homehub_app/scss/app.scss +++ b/packages/homehub_app/scss/app.scss @@ -1,5 +1,7 @@ +@use "sass:math"; + @import "scss/vendor/bootswatch/cyborg_variables"; -@import "scss/vendor/bootstrap/bootstrap"; +@import "scss/vendor/bootstrap46/bootstrap"; @import "scss/vendor/bootswatch/cyborg_variables"; @import "node_modules/@bthlabs/react-custom-popup/lib/react-custom-popup"; diff --git a/packages/homehub_app/scss/variables.scss b/packages/homehub_app/scss/variables.scss index 9d30076..b96a4ea 100644 --- a/packages/homehub_app/scss/variables.scss +++ b/packages/homehub_app/scss/variables.scss @@ -1,6 +1,8 @@ -@import "scss/vendor/bootstrap/_functions"; +@use "sass:math"; + +@import "scss/vendor/bootstrap46/_functions"; @import "scss/vendor/bootswatch/cyborg_variables"; -@import "scss/vendor/bootstrap/_variables"; +@import "scss/vendor/bootstrap46/_variables"; $taskbar-background: #101010; $taskbar-item-hover: #272727; diff --git a/packages/homehub_app/scss/vendor/bootstrap46/_alert.scss b/packages/homehub_app/scss/vendor/bootstrap46/_alert.scss new file mode 100755 index 0000000..4aa1fc2 --- /dev/null +++ b/packages/homehub_app/scss/vendor/bootstrap46/_alert.scss @@ -0,0 +1,52 @@ +// +// Base styles +// + +.alert { + position: relative; + padding: $alert-padding-y $alert-padding-x; + margin-bottom: $alert-margin-bottom; + border: $alert-border-width solid transparent; + @include border-radius($alert-border-radius); +} + +// Headings for larger alerts +.alert-heading { + // Specified to prevent conflicts of changing $headings-color + color: inherit; +} + +// Provide class for links that match alerts +.alert-link { + font-weight: $alert-link-font-weight; +} + + +// Dismissible alerts +// +// Expand the right padding and account for the close button's positioning. + +.alert-dismissible { + padding-right: $close-font-size + $alert-padding-x * 2; + + // Adjust close link position + .close { + position: absolute; + top: 0; + right: 0; + z-index: 2; + padding: $alert-padding-y $alert-padding-x; + color: inherit; + } +} + + +// Alternate styles +// +// Generate contextual modifier classes for colorizing the alert. + +@each $color, $value in $theme-colors { + .alert-#{$color} { + @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); + } +} diff --git a/packages/homehub_app/scss/vendor/bootstrap46/_badge.scss b/packages/homehub_app/scss/vendor/bootstrap46/_badge.scss new file mode 100755 index 0000000..42c5d08 --- /dev/null +++ b/packages/homehub_app/scss/vendor/bootstrap46/_badge.scss @@ -0,0 +1,54 @@ +// Base class +// +// Requires one of the contextual, color modifier classes for `color` and +// `background-color`. + +.badge { + display: inline-block; + padding: $badge-padding-y $badge-padding-x; + @include font-size($badge-font-size); + font-weight: $badge-font-weight; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + @include border-radius($badge-border-radius); + @include transition($badge-transition); + + @at-root a#{&} { + @include hover-focus() { + text-decoration: none; + } + } + + // Empty badges collapse automatically + &:empty { + display: none; + } +} + +// Quick fix for badges in buttons +.btn .badge { + position: relative; + top: -1px; +} + +// Pill badges +// +// Make them extra rounded with a modifier to replace v3's badges. + +.badge-pill { + padding-right: $badge-pill-padding-x; + padding-left: $badge-pill-padding-x; + @include border-radius($badge-pill-border-radius); +} + +// Colors +// +// Contextual variations (linked badges get darker on :hover). + +@each $color, $value in $theme-colors { + .badge-#{$color} { + @include badge-variant($value); + } +} diff --git a/packages/homehub_app/scss/vendor/bootstrap46/_breadcrumb.scss b/packages/homehub_app/scss/vendor/bootstrap46/_breadcrumb.scss new file mode 100755 index 0000000..9c204c7 --- /dev/null +++ b/packages/homehub_app/scss/vendor/bootstrap46/_breadcrumb.scss @@ -0,0 +1,42 @@ +.breadcrumb { + display: flex; + flex-wrap: wrap; + padding: $breadcrumb-padding-y $breadcrumb-padding-x; + margin-bottom: $breadcrumb-margin-bottom; + @include font-size($breadcrumb-font-size); + list-style: none; + background-color: $breadcrumb-bg; + @include border-radius($breadcrumb-border-radius); +} + +.breadcrumb-item { + // The separator between breadcrumbs (by default, a forward-slash: "/") + + .breadcrumb-item { + padding-left: $breadcrumb-item-padding; + + &::before { + float: left; // Suppress inline spacings and underlining of the separator + padding-right: $breadcrumb-item-padding; + color: $breadcrumb-divider-color; + content: escape-svg($breadcrumb-divider); + } + } + + // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built + // without `