From 6a3bd14343833b52b3fe6626d43675eee7dc76fb Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 7 Nov 2017 06:02:01 +0100 Subject: [PATCH 01/26] WIP: Refactor code --- config/rzl.js | 22 ++++++--- src/components/App.js | 63 ++++++++++++++++++++++++++ src/components/ControlMap.js | 86 ++++++++++++++++++++++++++++++++++++ src/components/SideBar.js | 62 ++++++++++++++++++++++++++ src/index.jsx | 84 ++--------------------------------- types/types.js | 14 +++++- webpack.common.js | 1 + 7 files changed, 245 insertions(+), 87 deletions(-) create mode 100644 src/components/App.js create mode 100644 src/components/ControlMap.js create mode 100644 src/components/SideBar.js diff --git a/config/rzl.js b/config/rzl.js index 6342361..840a383 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -122,7 +122,7 @@ const config : Config = { led_stahltrager: { name: "LED Stahlträger", position: [380, 300], - icon: "white-balance-iridescent mdi-rotate-90", + icon: "white-balance-iridescent rotate-90", iconColor: state => state.led_stahltraeger == "on" ? utils.rainbow : "#000000", ui: [ { @@ -150,7 +150,7 @@ const config : Config = { twinkle: { name: "Twinkle", position: [530, 560], - icon: "led-off mdi-flip-v", + icon: "led-off flip-v", iconColor: state => state.twinkle == "on" ? utils.rainbow : "#000000", ui: [ { @@ -399,18 +399,30 @@ const config : Config = { baseLayer: true, name: "RaumZeitLabor", defaultVisibility: "visible", - opacity: 0.7 + opacity: 0.7, + bounds: { + topLeft: [0, 0], + bottomRight: [1000, 700] + } }, { image: require("../img/layers/rzl/details.svg"), name: "Details", defaultVisibility: "visible", - opacity: 0.4 + opacity: 0.4, + bounds: { + topLeft: [0, 0], + bottomRight: [1000, 700] + } }, { image: require("../img/layers/rzl/labels.svg"), name: "Labels", - defaultVisibility: "visible" + defaultVisibility: "visible", + bounds: { + topLeft: [0, 0], + bottomRight: [1000, 700] + } } ] }; diff --git a/src/components/App.js b/src/components/App.js new file mode 100644 index 0000000..528aa6a --- /dev/null +++ b/src/components/App.js @@ -0,0 +1,63 @@ +// @flow +import React from "react"; + +import MuiThemeProvider from "material-ui/styles/MuiThemeProvider"; +import createMuiTheme from "material-ui/styles/createMuiTheme"; +import withStyles from "material-ui/styles/withStyles"; +import * as Colors from "material-ui/colors"; + +import SideBar from "components/SideBar"; +import ControlMap from "components/ControlMap"; + +export type AppProps = { + config: Config +}; + +export type AppState = { + selectedControl: string +}; + +class App extends React.Component { + constructor(props: AppProps & Classes) { + super(props); + } + + static styles(_theme: Object) { + return { + drawerPaper: { + width: 320 + } + }; + } + + get theme() { + return createMuiTheme({ + palette: { + primary: Colors[this.props.config.space.color] + } + }); + } + + get selectedControl(): Control { + return this.props.config.controls[this.state.selectedControl]; + } + + // + render() { + return ( +
+ +
+ {false && } +
+ + +
+ ); + } +} + +export default withStyles(App.styles)(App); diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js new file mode 100644 index 0000000..26b9dc5 --- /dev/null +++ b/src/components/ControlMap.js @@ -0,0 +1,86 @@ +// @flow +import React from "react"; +import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet"; +import Leaflet from "leaflet"; + +export type Point = [number, number]; + +const convertPoint = (p: Point) => [-p[1], p[0]]; + +export type ControlMapProps = { + width: number, + height: number, + zoom: number, + layers: Array, + controls: Controls +}; + +export default class ControlMap extends React.Component { + constructor(props: SpaceMapProps) { + super(props); + } + + get center(): Point { + return convertPoint([ + this.props.width / 2, + this.props.height / 2 + ]); + } + + render() { + return ( + + {this.renderMarkers()} + {this.renderLayers()} + + ); + } + + renderMarkers() { + return Object.values(this.props.controls).map(this.renderMarker.bind(this)); + } + + createLeafletIcon(iconRaw: string) { + const icon = iconRaw.split(" ").map(name => "mdi-".concat(name)).join(" "); + return Leaflet.divIcon({ + className: `mdi mdi-36px ${icon}`, + iconSize: Leaflet.point(36, 36), + iconAnchor: Leaflet.point(18, 18) + }); + } + + renderMarker(control: Control) { + return ( + + + ); + } + + renderLayers() { + return ( + + {this.props.layers.map(this.renderLayer)} + + ); + } + + renderLayer(layer: Layer) { + const LayersControlType = + layer.baseLayer ? LayersControl.BaseLayer : LayersControl.Overlay; + return ( + + + + ); + } +} diff --git a/src/components/SideBar.js b/src/components/SideBar.js new file mode 100644 index 0000000..421025b --- /dev/null +++ b/src/components/SideBar.js @@ -0,0 +1,62 @@ +// @flow +import React from "react"; + +import withStyles from "material-ui/styles/withStyles"; +import Drawer from "material-ui/Drawer"; +import Typography from "material-ui/Typography"; +import IconButton from "material-ui/IconButton"; +import AppBar from "material-ui/AppBar"; +import Toolbar from "material-ui/Toolbar"; +import List from "material-ui/List"; + +export type SideBarProps = { + control: Control, + onCloseRequest: () => void +}; + +export type SideBarState = { +}; + +class SideBar extends React.Component { + constructor(props: SideBarProps & Classes) { + super(props); + } + + static styles(_theme: Object): Object { + return { + drawerPaper: { + width: 320 + } + }; + } + + close() { + this.props.onCloseRequest(); + } + + render() { + return ( + + + + + + + + {this.props.control.name} + + + + + + + ); + } +} + +export default withStyles(SideBar.styles)(SideBar); diff --git a/src/index.jsx b/src/index.jsx index 3c098e6..3e9376d 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,24 +1,11 @@ // @flow import React from "react"; import ReactDOM from "react-dom"; -import MuiThemeProvider from "material-ui/styles/MuiThemeProvider"; -import createMuiTheme from "material-ui/styles/createMuiTheme"; -import withStyles from "material-ui/styles/withStyles"; -import Drawer from "material-ui/Drawer"; import injectTapEventPlugin from "react-tap-event-plugin"; -import { store, Actions } from "./state"; -import connectMqtt from "./mqtt"; -import SpaceMapBar from "./appbar"; -import * as UiItems from "./UiItems.js"; -import SpaceMap from "./map.js"; -import R from "ramda"; + +import App from "components/App"; + import Config from "./config"; -import Toolbar from "material-ui/Toolbar"; -import * as colors from "material-ui/colors"; -import Typography from "material-ui/Typography"; -import List from "material-ui/List"; -import IconButton from "material-ui/IconButton"; -import AppBar from "material-ui/AppBar"; import "../node_modules/mdi/css/materialdesignicons.min.css"; import "../css/styles.css"; @@ -27,67 +14,4 @@ injectTapEventPlugin(); document.title = `${Config.space.name} Map`; -const UiItem = (state) => (props : ControlUI) => - UiItems[props.type](state, props); - -const renderUi = (state: State, key: ?string) => - key != null && Config.controls[key] != null ? - R.map(UiItem(state), Config.controls[key].ui) : null; - -const theme = createMuiTheme({ - palette: { - primary: colors[Config.space.color] - } -}); - -const appStyles = withStyles((_theme) => ({ - drawerPaper: { - width: 320 - } -})); - -class app extends React.Component<{state: State, classes: Object}> { - render() { - const state = this.props.state; - const classes = this.props.classes; - if (state == null) return (
); - return ( -
- -
- - store.dispatch({type: Actions.CHANGE_UI})} - classes={{paper: classes.drawerPaper}} - type="persistent" - > - - - store.dispatch({type: Actions.CHANGE_UI})}> - - - - {state.uiOpened == null ? "" : Config.controls[state.uiOpened].name} - - - - - {renderUi(state, state.uiOpened)} - - -
- - -
- ); - } -} - -const App = appStyles(app); - -store.subscribe(() => ReactDOM.render(, document.getElementById("content"))); - -store.dispatch({type:null}); - -connectMqtt(Config.space.mqtt, store); +ReactDOM.render(, document.getElementById("content")); diff --git a/types/types.js b/types/types.js index a65abad..4bb1414 100644 --- a/types/types.js +++ b/types/types.js @@ -1,5 +1,9 @@ declare type Map = { [K]: V }; +declare type Classes = { + classes: Map +}; + declare type Topic = { state: string, command: string, @@ -23,7 +27,7 @@ declare type ControlUI = { // TOGGLE optional properties on?: string, // on override for toggle off?: string, // off override for toggle - toggled?: (internal: string, actual: any) => boolean, + toggled?: (internal: string, actual: any, state: Map) => boolean, // DROPDOWN optional properties options?: Map, //options for dropDown @@ -70,12 +74,18 @@ declare type State = { visibleLayers: Array }; +declare type Point = [number, number]; + declare type Layer = { image: string, name: string, baseLayer: boolean, defaultVisibility: "visible" | "hidden", - opacity: number + opacity: number, + bounds: { + topLeft: Point, + bottomRight: Point + } }; declare type StateAction = { diff --git a/webpack.common.js b/webpack.common.js index 0ca1564..31d08f1 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -11,6 +11,7 @@ const preBuildScripts = process.env.NO_FLOW == undefined ? module.exports = { resolve: { + modules: [path.resolve(__dirname, "src"), "node_modules"], extensions: ['.js', '.jsx'] }, output: { From 453e68b3208f27afe6f554cb472e2a1ed8dc60e6 Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 7 Nov 2017 06:14:48 +0100 Subject: [PATCH 02/26] Reimplement TopBar --- src/components/App.js | 4 +++- src/components/TopBar.js | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/components/TopBar.js diff --git a/src/components/App.js b/src/components/App.js index 528aa6a..26cae86 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -8,6 +8,7 @@ import * as Colors from "material-ui/colors"; import SideBar from "components/SideBar"; import ControlMap from "components/ControlMap"; +import TopBar from "components/TopBar"; export type AppProps = { config: Config @@ -42,12 +43,13 @@ class App extends React.Component { return this.props.config.controls[this.state.selectedControl]; } - // render() { return (
+ {false && }
diff --git a/src/components/TopBar.js b/src/components/TopBar.js new file mode 100644 index 0000000..9fe4243 --- /dev/null +++ b/src/components/TopBar.js @@ -0,0 +1,42 @@ +// @flow +import React from "react"; + +import AppBar from "material-ui/AppBar"; +import Toolbar from "material-ui/Toolbar"; +import Typography from "material-ui/Typography"; +import { CircularProgress } from "material-ui/Progress"; + +export type TopBarProps = { + title: string, + connected: boolean +}; + +export type TopBarState = { + +}; + +export default class TopBar extends React.Component { + constructor(props: TopBarProps) { + super(props); + } + + render() { + return ( + + + {this.renderConnectionIndicator()} + {this.props.title} + + + ); + } + + renderConnectionIndicator() { + if (this.props.connected) { + return (); + } + return ( + + ); + } +} From 74c4138bad40d0507e0feeda0b95c4fcd4d7d0ca Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 7 Nov 2017 06:55:48 +0100 Subject: [PATCH 03/26] semi working drawer --- css/styles.css | 2 +- package.json | 1 + src/components/App.js | 22 +++++++++++++++++----- src/components/ControlMap.js | 11 +++++++---- src/components/SideBar.js | 9 +++++---- 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/css/styles.css b/css/styles.css index 9b2dc9b..fc5146b 100644 --- a/css/styles.css +++ b/css/styles.css @@ -16,7 +16,7 @@ body .leaflet-div-icon { border: 0; background: transparent; } -.leaflet-marker-icon .mdi { +.leaflet-marker-icon.mdi { line-height: 1; } #drawer_uiComponents .mdi { diff --git a/package.json b/package.json index 8dbdb02..2b83983 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "babel-preset-env": "^1.6.0", "leaflet": "^1.2.0", + "lodash": "^4.17.4", "material-ui": "next", "material-ui-old": "npm:material-ui@latest", "mdi": "^2.0.46", diff --git a/src/components/App.js b/src/components/App.js index 26cae86..836de6b 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -15,12 +15,17 @@ export type AppProps = { }; export type AppState = { - selectedControl: string + selectedControl: ?Control, + drawerOpened: boolean }; -class App extends React.Component { +class App extends React.Component { constructor(props: AppProps & Classes) { super(props); + this.state = { + selectedControl: null, + drawerOpened: false + }; } static styles(_theme: Object) { @@ -39,8 +44,12 @@ class App extends React.Component { }); } - get selectedControl(): Control { - return this.props.config.controls[this.state.selectedControl]; + changeControl(control: ?Control = null) { + this.setState({selectedControl: control, drawerOpened: control != null}); + } + + closeDrawer() { + this.setState({drawerOpened: false}); } render() { @@ -50,12 +59,15 @@ class App extends React.Component {
- {false && } +
); diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index 26b9dc5..9ec0d74 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -2,6 +2,7 @@ import React from "react"; import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet"; import Leaflet from "leaflet"; +import _ from "lodash"; export type Point = [number, number]; @@ -12,7 +13,8 @@ export type ControlMapProps = { height: number, zoom: number, layers: Array, - controls: Controls + controls: Controls, + onChangeControl: (control: Control) => void }; export default class ControlMap extends React.Component { @@ -39,7 +41,7 @@ export default class ControlMap extends React.Component { } renderMarkers() { - return Object.values(this.props.controls).map(this.renderMarker.bind(this)); + return _.map(this.props.controls, this.renderMarker.bind(this)); } createLeafletIcon(iconRaw: string) { @@ -51,11 +53,12 @@ export default class ControlMap extends React.Component { }); } - renderMarker(control: Control) { + renderMarker(control: Control, key: string) { return ( this.props.onChangeControl(control)} > ); diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 421025b..00f0c0d 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -10,7 +10,8 @@ import Toolbar from "material-ui/Toolbar"; import List from "material-ui/List"; export type SideBarProps = { - control: Control, + control: ?Control, + open: boolean, onCloseRequest: () => void }; @@ -36,7 +37,7 @@ class SideBar extends React.Component { render() { return ( - { > - + - {this.props.control.name} + {this.props.control == null || this.props.control.name} From b84cc6d4a2b2300850fa62a50b51906412e3df68 Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 7 Nov 2017 08:14:49 +0100 Subject: [PATCH 04/26] Add Icon to sidebar --- src/components/ControlMap.js | 6 +++--- src/components/SideBar.js | 14 ++++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index 9ec0d74..c74c5aa 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -3,6 +3,7 @@ import React from "react"; import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet"; import Leaflet from "leaflet"; import _ from "lodash"; +import parseIconName from "utils/parseIconName"; export type Point = [number, number]; @@ -44,10 +45,9 @@ export default class ControlMap extends React.Component { return _.map(this.props.controls, this.renderMarker.bind(this)); } - createLeafletIcon(iconRaw: string) { - const icon = iconRaw.split(" ").map(name => "mdi-".concat(name)).join(" "); + createLeafletIcon(icon: string) { return Leaflet.divIcon({ - className: `mdi mdi-36px ${icon}`, + className: parseIconName(`${icon} 36px`), iconSize: Leaflet.point(36, 36), iconAnchor: Leaflet.point(18, 18) }); diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 00f0c0d..2f095c3 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -8,6 +8,7 @@ import IconButton from "material-ui/IconButton"; import AppBar from "material-ui/AppBar"; import Toolbar from "material-ui/Toolbar"; import List from "material-ui/List"; +import { renderIcon } from "utils/parseIconName"; export type SideBarProps = { control: ?Control, @@ -27,6 +28,9 @@ class SideBar extends React.Component { return { drawerPaper: { width: 320 + }, + flex: { + flex: 1 } }; } @@ -45,12 +49,14 @@ class SideBar extends React.Component { > - - - - + {this.props.control == null + || renderIcon(this.props.control.icon, "mdi-36px")} + {this.props.control == null || this.props.control.name} + + + From 82081e7c834efa410e5ed56ab427cd0329583dfa Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 7 Nov 2017 20:33:07 +0100 Subject: [PATCH 05/26] add icon colors --- config/rzl.js | 28 ++++++++++++++-------------- css/styles.css | 3 --- src/components/App.js | 8 ++++++-- src/components/ControlMap.js | 20 +++++++++++++++----- types/types.js | 20 +++++++++++--------- 5 files changed, 46 insertions(+), 33 deletions(-) diff --git a/config/rzl.js b/config/rzl.js index 840a383..6561b2c 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -123,7 +123,7 @@ const config : Config = { name: "LED Stahlträger", position: [380, 300], icon: "white-balance-iridescent rotate-90", - iconColor: state => state.led_stahltraeger == "on" ? utils.rainbow : "#000000", + iconColor: ({led_stahltraeger}) => led_stahltraeger == "on" ? utils.rainbow : "#000000", ui: [ { type: "toggle", @@ -137,7 +137,7 @@ const config : Config = { name: "Snackbar", position: [510, 500], icon: "fridge", - iconColor: state => state.snackbar == "on" ? "#E20074" : "#000000", + iconColor: ({snackbar}) => snackbar == "on" ? "#E20074" : "#000000", ui: [ { type: "toggle", @@ -151,7 +151,7 @@ const config : Config = { name: "Twinkle", position: [530, 560], icon: "led-off flip-v", - iconColor: state => state.twinkle == "on" ? utils.rainbow : "#000000", + iconColor: ({twinkle}) => twinkle == "on" ? utils.rainbow : "#000000", ui: [ { type: "toggle", @@ -165,7 +165,7 @@ const config : Config = { name: "Ventilator", position: [520, 450], icon: "fan", - iconColor: state => state.fan == "on" ? "#00FF00" : "#000000", + iconColor: ({fan}) => fan == "on" ? "#00FF00" : "#000000", ui: [ { type: "toggle", @@ -191,7 +191,7 @@ const config : Config = { name: "Videospiele", position: [100, 100], icon: "gamepad-variant", - iconColor: state => state.videogames == "on" ? "#00FF00" : "#000000", + iconColor: ({videogames}) => videogames == "on" ? "#00FF00" : "#000000", ui: [ { type: "toggle", @@ -205,7 +205,7 @@ const config : Config = { name: "Rechner und Drucker", position: [297, 90], icon: "desktop-classic", - iconColor: state => state.olymp_pc == "on" ? "#00FF00" : "#000000", + iconColor: ({olymp_pc}) => olymp_pc == "on" ? "#00FF00" : "#000000", ui: [ { type: "toggle", @@ -219,7 +219,7 @@ const config : Config = { name: "Fliegenbratgerät", position: [450, 590], icon: "fire", - iconColor: state => state.flyfry == "on" ? "#6666FF" : "#000000", + iconColor: ({flyfry}) => flyfry == "on" ? "#6666FF" : "#000000", ui: [ { type: "toggle", @@ -233,7 +233,7 @@ const config : Config = { name: "Artnet", position: [535,480], icon: "spotlight", - iconColor: state => + iconColor: ({artnet}) => ({ off: "#000000", yellow: "#CCCC00", @@ -241,7 +241,7 @@ const config : Config = { purple: "#FF00FF", green: "#00FF00", cycle: utils.rainbow - })[state.artnet], + })[artnet], ui: [ { type: "toggle", @@ -270,8 +270,8 @@ const config : Config = { onkyo: { name: "Onkyo", position: [350, 650], - iconColor: state => - state.onkyo_connection != "connected" ? "#888888" : (state.onkyo_power == "on" ? "#00FF00" : "#000000"), + iconColor: ({onkyo_connection, onkyo_power}) => + onkyo_connection != "connected" ? "#888888" : (onkyo_power == "on" ? "#00FF00" : "#000000"), icon: "volume-high", ui: [ { @@ -350,7 +350,7 @@ const config : Config = { name: "Rundumleuchte", position: [310,275], icon: "alarm-light", - iconColor: state => state.rundumleuchte == "on" ? "#CCCC00" : "#000000", + iconColor: ({runumleuchte}) => rundumleuchte == "on" ? "#CCCC00" : "#000000", ui: [ { type: "toggle", @@ -364,7 +364,7 @@ const config : Config = { name: "Tür", position: [455,350], icon: "swap-vertical", - iconColor: state => state.door_status == "on" ? "#00FF00" : "#FF0000", + iconColor: ({door_status}) => door_status == "on" ? "#00FF00" : "#FF0000", ui: [ { type: "link", @@ -377,7 +377,7 @@ const config : Config = { name: "Infoscreen", position: [255, 495], icon: "developer-board", - iconColor: state => state.infoscreen == "on" ? "#4444FF" : "#000000", + iconColor: ({infoscreen}) => infoscreen == "on" ? "#4444FF" : "#000000", ui: [ { type: "toggle", diff --git a/css/styles.css b/css/styles.css index fc5146b..c209e4e 100644 --- a/css/styles.css +++ b/css/styles.css @@ -16,9 +16,6 @@ body .leaflet-div-icon { border: 0; background: transparent; } -.leaflet-marker-icon.mdi { - line-height: 1; -} #drawer_uiComponents .mdi { width: auto; height: auto; diff --git a/src/components/App.js b/src/components/App.js index 836de6b..bd44a09 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -1,5 +1,6 @@ // @flow import React from "react"; +import _ from "lodash"; import MuiThemeProvider from "material-ui/styles/MuiThemeProvider"; import createMuiTheme from "material-ui/styles/createMuiTheme"; @@ -16,7 +17,8 @@ export type AppProps = { export type AppState = { selectedControl: ?Control, - drawerOpened: boolean + drawerOpened: boolean, + mqttState: State }; class App extends React.Component { @@ -24,7 +26,8 @@ class App extends React.Component { super(props); this.state = { selectedControl: null, - drawerOpened: false + drawerOpened: false, + mqttState: _.map(props.topics, ({defaultValue}) => defaultValue) }; } @@ -68,6 +71,7 @@ class App extends React.Component { layers={this.props.config.layers} controls={this.props.config.controls} onChangeControl={this.changeControl.bind(this)} + state={this.state.mqttState} /> ); diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index c74c5aa..1cf65a6 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -15,7 +15,8 @@ export type ControlMapProps = { zoom: number, layers: Array, controls: Controls, - onChangeControl: (control: Control) => void + onChangeControl: (control: Control) => void, + state: State }; export default class ControlMap extends React.Component { @@ -45,19 +46,28 @@ export default class ControlMap extends React.Component { return _.map(this.props.controls, this.renderMarker.bind(this)); } - createLeafletIcon(icon: string) { + createLeafletIcon(control: Control) { + const iconClass = parseIconName(`${control.icon} 36px`); return Leaflet.divIcon({ - className: parseIconName(`${icon} 36px`), iconSize: Leaflet.point(36, 36), - iconAnchor: Leaflet.point(18, 18) + iconAnchor: Leaflet.point(18, 18), + html: `` }); } + iconColor(control: Control) { + if (control.iconColor == null) { + return "#000"; + } + return control.iconColor(this.props.state); + } + renderMarker(control: Control, key: string) { return ( this.props.onChangeControl(control)} > diff --git a/types/types.js b/types/types.js index 4bb1414..4842319 100644 --- a/types/types.js +++ b/types/types.js @@ -19,7 +19,7 @@ declare type ControlUI = { topic?: string, icon?: string, - enableCondition?: (internal: string, actual: any) => boolean, + enableCondition?: (internal: string, actual: any, state: State) => boolean, // LINK optiona properties link?: string, @@ -27,7 +27,7 @@ declare type ControlUI = { // TOGGLE optional properties on?: string, // on override for toggle off?: string, // off override for toggle - toggled?: (internal: string, actual: any, state: Map) => boolean, + toggled?: (internal: string, actual: any, state: State) => boolean, // DROPDOWN optional properties options?: Map, //options for dropDown @@ -43,7 +43,7 @@ declare type Control = { name: string, position: Array, icon: string, - iconColor?: (state: Map) => string, + iconColor?: (state: State) => string, ui: Array }; declare type Controls = Map; @@ -61,18 +61,20 @@ declare type Space = { "green"|"lightgreen"|"lime"|"yellow"|"amber"|"orange"|"deepOrange"|"brown"|"grey"|"blueGrey" }; -declare type State = { - mqtt: ?any, - uiOpened: ?string, +declare type State = Map; + +//declare type State = { +// mqtt: ?any, +// uiOpened: ?string, // A map of the actual state values for each topic. // internal is the internal term for the value, // that is equal to the key in the values section of that // topic, for example given by: // values: { off: "OFF", on: "ON" } // and actual is the value of that or whatever is given by mqtt. - values: Map, - visibleLayers: Array -}; +// values: Map, +// visibleLayers: Array +//}; declare type Point = [number, number]; From b22e28dc441f60f75784768a3b9896f3e932a43d Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 10 Nov 2017 19:45:44 +0100 Subject: [PATCH 06/26] First sketch of ui types --- .eslintrc.js | 5 + config/rzl.js | 2 +- package.json | 6 +- src/components/App.js | 12 ++- src/components/SideBar.js | 1 + src/components/UiItemList.js | 88 +++++++++++++++ src/utils/parseIconName.js | 10 ++ yarn.lock | 202 ++++++++++++++++++----------------- 8 files changed, 221 insertions(+), 105 deletions(-) create mode 100644 src/components/UiItemList.js create mode 100644 src/utils/parseIconName.js diff --git a/.eslintrc.js b/.eslintrc.js index ea33d35..83cca54 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -126,6 +126,11 @@ module.exports = { "space-before-blocks": "error", "quotes": ["error", "double"], + // ES6 + "arrow-spacing": "error", + "arrow-parens": "warning", + "no-confusing-arrow": ["error", {"allowParens": true}], + // react "react/prop-types": "off", "react/display-name": "off", diff --git a/config/rzl.js b/config/rzl.js index 6561b2c..088e479 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -350,7 +350,7 @@ const config : Config = { name: "Rundumleuchte", position: [310,275], icon: "alarm-light", - iconColor: ({runumleuchte}) => rundumleuchte == "on" ? "#CCCC00" : "#000000", + iconColor: ({rundumleuchte}) => rundumleuchte == "on" ? "#CCCC00" : "#000000", ui: [ { type: "toggle", diff --git a/package.json b/package.json index 2b83983..9c92663 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "mdi": "^2.0.46", "mqtt": "^2.11.0", "ramda": "^0.24.1", - "react": "^15.6.1", - "react-dom": "^15.6.1", + "react": "^16.0.0", + "react-dom": "^16.0.0", "react-leaflet": "^1.5.0", - "react-tap-event-plugin": "^2.0.1", + "react-tap-event-plugin": "^3.0.0", "redux": "^3.7.2" }, "devDependencies": { diff --git a/src/components/App.js b/src/components/App.js index bd44a09..4865bd8 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -10,6 +10,7 @@ import * as Colors from "material-ui/colors"; import SideBar from "components/SideBar"; import ControlMap from "components/ControlMap"; import TopBar from "components/TopBar"; +import UiItemList from "components/UiItemList"; export type AppProps = { config: Config @@ -27,7 +28,10 @@ class App extends React.Component { this.state = { selectedControl: null, drawerOpened: false, - mqttState: _.map(props.topics, ({defaultValue}) => defaultValue) + mqttState: _.map(props.topics, topic => ({ + actual: topic.defaultValue, + internal: topic.values[topic.defaultValue] + })) }; } @@ -64,7 +68,11 @@ class App extends React.Component { connected={false} /> + onCloseRequest={this.closeDrawer.bind(this)} + > + {this.state.selectedControl == null + || } + { + {this.props.children} ); diff --git a/src/components/UiItemList.js b/src/components/UiItemList.js new file mode 100644 index 0000000..9b722b9 --- /dev/null +++ b/src/components/UiItemList.js @@ -0,0 +1,88 @@ +// @flow +import React from "react"; +import _ from "lodash"; +import { + ListItem, + ListItemIcon, + ListItemSecondaryAction, + ListItemText, + ListSubheader +} from "material-ui/List"; +import Switch from "material-ui/Switch"; +import { renderIcon } from "utils/parseIconName"; + +export type UiItemListProps = { + controls: Array, + state: State +}; + +export default class UiItemList extends React.Component { + constructor(props: UiItemListProps) { + super(props); + } + + render() { + return this.props.controls.map((control, key) => ( + + {control.icon == null || {renderIcon(control.icon, "mdi-24px")}} + {this.renderControl(control)} + + )); + } + + renderControl(control: ControlUI) { + switch (control.type) { + case "toggle": { + return this.renderToggle(control); + } + default: { + console.error( + `Unknown UI type "${control.type}" for "${control.text}" component` + ); + return "unknown ui type"; + } + } + } + + isEnabled(control: ControlUI) { + const enableCondition = control.enableCondition; + if (enableCondition == null) { + return true; + } else { + const value = this.getValue(control); + return enableCondition( + value.internal || value.actual, value.actual, this.props.state); + } + } + + getValue(control: ControlUI) { + const value = this.props.state[control.topic]; + if (value == null) { + console.error( + `Unknown topic "${control.topic}" in ${control.type} "${control.text}"` + ); + return { internal: "error", actual: "error" }; + } + return value; + } + + toggleSwitch(control: ControlUI, newState: boolean) { + + } + + renderToggle(control: ControlUI) { + const value = this.getValue(control); + const isToggled = control.isToggled || (i => i === (control.on || "on")); + const checked = isToggled( + value.internal || value.actual, value.actual, this.props.state); + return [ + , + + this.toggleSwitch(control, state)} + disabled={!this.isEnabled(control)} /> + + ]; + } +} diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js new file mode 100644 index 0000000..a07dede --- /dev/null +++ b/src/utils/parseIconName.js @@ -0,0 +1,10 @@ +// @flow +import React from "react"; + +export default function parseIconName(name: string): string { + return `mdi ${name.split(" ").map(icon => "mdi-".concat(icon)).join(" ")}`; +} + +export const renderIcon = (name: string, extraClass?: string) => { + return ; +}; diff --git a/yarn.lock b/yarn.lock index e6e044a..632662c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,59 @@ # yarn lockfile v1 +"@babel/code-frame@7.0.0-beta.31", "@babel/code-frame@^7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +"@babel/helper-function-name@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57" + dependencies: + "@babel/helper-get-function-arity" "7.0.0-beta.31" + "@babel/template" "7.0.0-beta.31" + "@babel/traverse" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + +"@babel/helper-get-function-arity@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493" + dependencies: + "@babel/types" "7.0.0-beta.31" + +"@babel/template@7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda" + dependencies: + "@babel/code-frame" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + babylon "7.0.0-beta.31" + lodash "^4.2.0" + +"@babel/traverse@7.0.0-beta.31", "@babel/traverse@^7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df" + dependencies: + "@babel/code-frame" "7.0.0-beta.31" + "@babel/helper-function-name" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.31" + babylon "7.0.0-beta.31" + debug "^3.0.1" + globals "^10.0.0" + invariant "^2.2.0" + lodash "^4.2.0" + +"@babel/types@7.0.0-beta.31", "@babel/types@^7.0.0-beta.31": + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4" + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -209,8 +262,8 @@ async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.1.2, async@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" + version "2.6.0" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: lodash "^4.14.0" @@ -262,14 +315,6 @@ babel-cli@^6.24.1: optionalDependencies: chokidar "^1.6.1" -babel-code-frame@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-7.0.0-beta.0.tgz#418a7b5f3f7dc9a4670e61b1158b4c5661bec98d" - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^3.0.0" - babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -303,13 +348,13 @@ babel-core@^6.25.0, babel-core@^6.26.0: source-map "^0.5.6" babel-eslint@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.1.tgz#5d718be7a328625d006022eb293ed3008cbd6346" + version "8.0.2" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.2.tgz#e44fb9a037d749486071d52d65312f5c20aa7530" dependencies: - babel-code-frame "7.0.0-beta.0" - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" + "@babel/code-frame" "^7.0.0-beta.31" + "@babel/traverse" "^7.0.0-beta.31" + "@babel/types" "^7.0.0-beta.31" + babylon "^7.0.0-beta.31" babel-generator@^6.26.0: version "6.26.0" @@ -366,15 +411,6 @@ babel-helper-explode-assignable-expression@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helper-function-name@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-7.0.0-beta.0.tgz#d1b6779b647e5c5c31ebeb05e13b998e4d352d56" - dependencies: - babel-helper-get-function-arity "7.0.0-beta.0" - babel-template "7.0.0-beta.0" - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babel-helper-function-name@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" @@ -385,12 +421,6 @@ babel-helper-function-name@^6.24.1: babel-traverse "^6.24.1" babel-types "^6.24.1" -babel-helper-get-function-arity@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-7.0.0-beta.0.tgz#9d1ab7213bb5efe1ef1638a8ea1489969b5a8b6e" - dependencies: - babel-types "7.0.0-beta.0" - babel-helper-get-function-arity@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" @@ -456,10 +486,6 @@ babel-loader@^7.1.1: loader-utils "^1.0.2" mkdirp "^0.5.1" -babel-messages@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-7.0.0-beta.0.tgz#6df01296e49fc8fbd0637394326a167f36da817b" - babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -803,15 +829,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runti core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-7.0.0-beta.0.tgz#85083cf9e4395d5e48bf5154d7a8d6991cafecfb" - dependencies: - babel-traverse "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" - lodash "^4.2.0" - babel-template@^6.24.1, babel-template@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" @@ -822,20 +839,6 @@ babel-template@^6.24.1, babel-template@^6.26.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-7.0.0-beta.0.tgz#da14be9b762f62a2f060db464eaafdd8cd072a41" - dependencies: - babel-code-frame "7.0.0-beta.0" - babel-helper-function-name "7.0.0-beta.0" - babel-messages "7.0.0-beta.0" - babel-types "7.0.0-beta.0" - babylon "7.0.0-beta.22" - debug "^3.0.1" - globals "^10.0.0" - invariant "^2.2.0" - lodash "^4.2.0" - babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" @@ -850,14 +853,6 @@ babel-traverse@^6.24.1, babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.0.tgz#eb8b6e556470e6dcc4aef982d79ad229469b5169" - dependencies: - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^2.0.0" - babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" @@ -867,9 +862,9 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" -babylon@7.0.0-beta.22: - version "7.0.0-beta.22" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.22.tgz#74f0ad82ed7c7c3cfeab74cf684f815104161b65" +babylon@7.0.0-beta.31, babylon@^7.0.0-beta.31: + version "7.0.0-beta.31" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f" babylon@^6.18.0: version "6.18.0" @@ -1071,10 +1066,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2: - version "2.7.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.7.0.tgz#dc375dc70048fec3d989042a35022342902eff00" + version "2.8.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.8.0.tgz#27d64028130a2e8585ca96f7c3b7730eff4de493" dependencies: - caniuse-lite "^1.0.30000757" + caniuse-lite "^1.0.30000758" electron-to-chromium "^1.3.27" buffer-indexof@^1.0.0: @@ -1166,12 +1161,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000758" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000758.tgz#a235627b1922e878b63164942c991b84de92c810" + version "1.0.30000760" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d" -caniuse-lite@^1.0.30000757: - version "1.0.30000758" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000758.tgz#e261140076651049cf6891ed4bc649b5c8c26c69" +caniuse-lite@^1.0.30000758: + version "1.0.30000760" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff" caseless@~0.12.0: version "0.12.0" @@ -1299,8 +1294,8 @@ cliui@^3.2.0: wrap-ansi "^2.0.0" clone@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" co@^4.6.0: version "4.6.0" @@ -1317,8 +1312,8 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" color-convert@^1.3.0, color-convert@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" dependencies: color-name "^1.1.1" @@ -1404,8 +1399,8 @@ concat-stream@^1.6.0: typedarray "^0.0.6" connect-history-api-fallback@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz#3db24f973f4b923b0e82f619ce0df02411ca623d" + version "1.5.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" console-browserify@^1.1.0: version "1.1.0" @@ -2446,8 +2441,8 @@ fs-extra@^4.0.0: universalify "^0.1.0" fs-readdir-recursive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560" + version "1.1.0" + resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" fs.realpath@^1.0.0: version "1.0.0" @@ -4747,14 +4742,14 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" +react-dom@^16.0.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.0.tgz#ab6fd2a285096f388aeba51919a573d06c9bdde4" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" react-event-listener@^0.5.0, react-event-listener@^0.5.1: version "0.5.1" @@ -4802,9 +4797,9 @@ react-scrollbar-size@^2.0.2: prop-types "^15.5.10" react-event-listener "^0.5.0" -react-tap-event-plugin@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz#316beb3bc6556e29ec869a7293e89c826a9074d2" +react-tap-event-plugin@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/react-tap-event-plugin/-/react-tap-event-plugin-3.0.2.tgz#280371677b881c31376e0027a0b86d2c6de039ee" dependencies: fbjs "^0.8.6" @@ -4829,7 +4824,7 @@ react-transition-group@^2.2.1: prop-types "^15.5.8" warning "^3.0.0" -react@^15.5.4, react@^15.6.1: +react@^15.5.4: version "15.6.2" resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: @@ -4839,6 +4834,15 @@ react@^15.5.4, react@^15.6.1: object-assign "^4.1.0" prop-types "^15.5.10" +react@^16.0.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.1.0.tgz#1c2bdac3c17fe7ee9282fa35aca6cc36387903e1" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -5719,8 +5723,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-js@3.1.x: - version "3.1.7" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.7.tgz#13379168b7fcf132ed977254a7802e0a294b1ffb" + version "3.1.8" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.8.tgz#780d08b4f6782fe36ea5484d952362eddaf1d7b8" dependencies: commander "~2.11.0" source-map "~0.6.1" @@ -6092,8 +6096,8 @@ write@^0.2.1: mkdirp "^0.5.1" ws@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.0.tgz#f8b948a1378af7efa702f5513da08dd516897c31" + version "3.3.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.1.tgz#d97e34dee06a1190c61ac1e95f43cb60b78cf939" dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" From 3afba102b017c39316e8cad82a7abd70c8b4068c Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 10 Nov 2017 22:07:07 +0100 Subject: [PATCH 07/26] Implement every UI type except slider --- .eslintrc.js | 2 +- src/UiItems.js | 4 +- src/components/App.js | 9 ++- src/components/UiItemList.js | 112 ++++++++++++++++++++++++++++------- src/map.js | 6 +- src/mqtt.js | 2 +- src/state.js | 6 +- src/util.js | 2 +- src/utils/parseIconName.js | 2 +- 9 files changed, 110 insertions(+), 35 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 83cca54..76f7bca 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -128,7 +128,7 @@ module.exports = { // ES6 "arrow-spacing": "error", - "arrow-parens": "warning", + "arrow-parens": "warn", "no-confusing-arrow": ["error", {"allowParens": true}], // react diff --git a/src/UiItems.js b/src/UiItems.js index 10552f8..fb54a15 100644 --- a/src/UiItems.js +++ b/src/UiItems.js @@ -25,8 +25,8 @@ const enabled = (props: ControlUI, state: State) => { const val = state.values[props.topic]; return props.enableCondition( val.internal == null ? val.actual : val.internal, val.actual, - R.map(x => x.internal == null ? x.actual - : x.internal, state.values == null ? {} : state.values)); + R.map((x) => (x.internal == null ? x.actual + : x.internal), state.values == null ? {} : state.values)); } }; diff --git a/src/components/App.js b/src/components/App.js index 4865bd8..5ea6c7a 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -12,6 +12,8 @@ import ControlMap from "components/ControlMap"; import TopBar from "components/TopBar"; import UiItemList from "components/UiItemList"; +import { keyOf } from "../util"; + export type AppProps = { config: Config }; @@ -28,9 +30,9 @@ class App extends React.Component { this.state = { selectedControl: null, drawerOpened: false, - mqttState: _.map(props.topics, topic => ({ + mqttState: _.mapValues(props.config.topics, (topic) => ({ actual: topic.defaultValue, - internal: topic.values[topic.defaultValue] + internal: keyOf(topic.values, topic.defaultValue) })) }; } @@ -71,7 +73,8 @@ class App extends React.Component { onCloseRequest={this.closeDrawer.bind(this)} > {this.state.selectedControl == null - || } + || } diff --git a/src/components/UiItemList.js b/src/components/UiItemList.js index 9b722b9..c8605fd 100644 --- a/src/components/UiItemList.js +++ b/src/components/UiItemList.js @@ -10,6 +10,11 @@ import { } from "material-ui/List"; import Switch from "material-ui/Switch"; import { renderIcon } from "utils/parseIconName"; +import Input, { InputLabel } from "material-ui/Input"; +import { FormControl } from "material-ui/Form"; +import Select from "material-ui/Select"; +import { MenuItem } from "material-ui/Menu"; +import Button from "material-ui/Button"; export type UiItemListProps = { controls: Array, @@ -22,25 +27,44 @@ export default class UiItemList extends React.Component { } render() { - return this.props.controls.map((control, key) => ( - - {control.icon == null || {renderIcon(control.icon, "mdi-24px")}} - {this.renderControl(control)} - - )); + return this.props.controls.map((control, key) => { + if (control.type == null) { + throw new Error( + "A control is missing the \"type\" parameter" + ); + } + if (control.type === "section") { + return this.renderControl(control); + } + return ( + + {control.icon == null || + {renderIcon(control.icon, "mdi-24px")}} + {this.renderControl(control)} + + ); + }); } renderControl(control: ControlUI) { switch (control.type) { - case "toggle": { - return this.renderToggle(control); - } - default: { - console.error( - `Unknown UI type "${control.type}" for "${control.text}" component` - ); - return "unknown ui type"; - } + case "toggle": { + return this.renderToggle(control); + } + case "dropDown": { + return this.renderDropDown(control); + } + case "section": { + return this.renderSection(control); + } + case "link": { + return this.renderLink(control); + } + default: { + throw new Error( + `Unknown UI type "${control.type}" for "${control.text}" component` + ); + } } } @@ -58,21 +82,20 @@ export default class UiItemList extends React.Component { getValue(control: ControlUI) { const value = this.props.state[control.topic]; if (value == null) { - console.error( + throw new Error( `Unknown topic "${control.topic}" in ${control.type} "${control.text}"` ); - return { internal: "error", actual: "error" }; } return value; } - toggleSwitch(control: ControlUI, newState: boolean) { + toggleSwitch(_control: ControlUI, _newState: boolean) { } renderToggle(control: ControlUI) { const value = this.getValue(control); - const isToggled = control.isToggled || (i => i === (control.on || "on")); + const isToggled = control.isToggled || ((i) => i === (control.on || "on")); const checked = isToggled( value.internal || value.actual, value.actual, this.props.state); return [ @@ -80,9 +103,58 @@ export default class UiItemList extends React.Component { this.toggleSwitch(control, state)} + onChange={(state) => this.toggleSwitch(control, state)} disabled={!this.isEnabled(control)} /> ]; } + + changeDropDown(_control: ControlUI, _newState: string) { + + } + + renderDropDown(control: ControlUI) { + const value = this.getValue(control); + const id = `${control.topic}-${control.name}`; + const options = control.options; + if (options == null) { + throw new Error( + `Parameter "options" missing for ${control.type} "${control.text}"` + ); + } + return ( + + {control.text} + } + > + {_.map(options, (v, k) => {v})} + + + ); + } + + renderSection(control: ControlUI) { + return ( + {control.text} + ); + } + + renderLink(control: ControlUI) { + if (control.link == null) { + throw new Error( + `Parameter "link" missing for ${control.type} "${control.text}"` + ); + } + return ( + + ); + } } diff --git a/src/map.js b/src/map.js index a4471ab..ebed3e5 100644 --- a/src/map.js +++ b/src/map.js @@ -14,8 +14,8 @@ const color = (iconColor, state: State) => { // TODO: give iconColor not only internal but also actual values return iconColor == null ? "#000000" : iconColor( - R.map(x => x.internal == null ? - x.actual : x.internal, state.values == null ? {} : state.values) + R.map((x) => (x.internal == null ? + x.actual : x.internal), state.values == null ? {} : state.values) ); }; const iconHtml = (el, state: State) => @@ -59,7 +59,7 @@ class SpaceMap extends React.Component { crs={Leaflet.CRS.Simple}> {Markers(props)} - {Config.layers.map(x => + {Config.layers.map((x) => this.renderLayer(x, [c([0, 0]), c([props.width, props.height])]))} diff --git a/src/mqtt.js b/src/mqtt.js index 7e60fca..6ec04e4 100644 --- a/src/mqtt.js +++ b/src/mqtt.js @@ -11,7 +11,7 @@ export default function connectMqtt(url: string, store: Store<*, *>) { store.dispatch({ type: Actions.MQTT_CONNECT, payload: client }); - R.forEachObjIndexed(v => + R.forEachObjIndexed((v) => client.subscribe(v.state), Config.topics); }); client.on("message", (topic, message) => { diff --git a/src/state.js b/src/state.js index c50fc90..e64b31d 100644 --- a/src/state.js +++ b/src/state.js @@ -15,7 +15,7 @@ const initState : State = { mqtt: null, uiOpened: null, values: R.map( - topic => { + (topic) => { return { internal: keyOf(topic.values, topic.defaultValue), actual: topic.defaultValue @@ -37,7 +37,7 @@ const onMessage = (state: State, action: StateAction) => { const payload = action.payload == null ? { topic: "", message: {} } : action.payload; // thx flow val.state === payload.topic, Config.topics)); + (val) => val.state === payload.topic, Config.topics)); const message = payload.message; const parsedMessage = (topic: string) => { let parseFunction = Config.topics[topic].parseState; @@ -54,7 +54,7 @@ const onMessage = (state: State, action: StateAction) => { }; }; return R.mergeDeepRight(state, R.objOf("values", R.mergeAll( - R.map(topic => R.objOf(topic, newValue(topic)), topics) + R.map((topic) => R.objOf(topic, newValue(topic)), topics) ))); }; diff --git a/src/util.js b/src/util.js index aebc15b..75cb598 100644 --- a/src/util.js +++ b/src/util.js @@ -2,4 +2,4 @@ import R from "ramda"; export const keyOf = (map: Map, value: a): ?b => - ((keys) => keys[R.findIndex(k => map[k] === value, keys)])(R.keys(map)); + ((keys) => keys[R.findIndex((k) => map[k] === value, keys)])(R.keys(map)); diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js index a07dede..9aa5285 100644 --- a/src/utils/parseIconName.js +++ b/src/utils/parseIconName.js @@ -2,7 +2,7 @@ import React from "react"; export default function parseIconName(name: string): string { - return `mdi ${name.split(" ").map(icon => "mdi-".concat(icon)).join(" ")}`; + return `mdi ${name.split(" ").map((icon) => "mdi-".concat(icon)).join(" ")}`; } export const renderIcon = (name: string, extraClass?: string) => { From 2c433c7df0872d2d28dd5d21c9e384cd9663c8fd Mon Sep 17 00:00:00 2001 From: uwap Date: Sat, 11 Nov 2017 04:52:02 +0100 Subject: [PATCH 08/26] Semi working state --- src/components/App.js | 13 +++++++++++-- src/components/UiItemList.js | 20 +++++++++++--------- src/utils/keyOf.js | 8 ++++++++ 3 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 src/utils/keyOf.js diff --git a/src/components/App.js b/src/components/App.js index 5ea6c7a..87e77e9 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -12,7 +12,7 @@ import ControlMap from "components/ControlMap"; import TopBar from "components/TopBar"; import UiItemList from "components/UiItemList"; -import { keyOf } from "../util"; +import keyOf from "utils/keyOf"; export type AppProps = { config: Config @@ -61,6 +61,14 @@ class App extends React.Component { this.setState({drawerOpened: false}); } + changeState(topic: string, value: any) { + this.setState({mqttState: _.merge(this.state.mqttState, + { [topic]: { + actual: this.props.config.topics[topic].values[value], + internal: value + }})}); + } + render() { return (
@@ -74,7 +82,8 @@ class App extends React.Component { > {this.state.selectedControl == null || } + controls={this.state.selectedControl.ui} + onChangeState={this.changeState.bind(this)} />}
diff --git a/src/components/UiItemList.js b/src/components/UiItemList.js index c8605fd..0cde9a9 100644 --- a/src/components/UiItemList.js +++ b/src/components/UiItemList.js @@ -18,7 +18,8 @@ import Button from "material-ui/Button"; export type UiItemListProps = { controls: Array, - state: State + state: State, + onChangeState: (topic: string, nextState: any) => void }; export default class UiItemList extends React.Component { @@ -89,13 +90,14 @@ export default class UiItemList extends React.Component { return value; } - toggleSwitch(_control: ControlUI, _newState: boolean) { - + toggleSwitch(control: ControlUI, newState: boolean) { + this.props.onChangeState(control.topic, + newState ? (control.on || "on") : (control.off || "off")); } renderToggle(control: ControlUI) { const value = this.getValue(control); - const isToggled = control.isToggled || ((i) => i === (control.on || "on")); + const isToggled = control.toggled || ((i) => i === (control.on || "on")); const checked = isToggled( value.internal || value.actual, value.actual, this.props.state); return [ @@ -103,14 +105,14 @@ export default class UiItemList extends React.Component { this.toggleSwitch(control, state)} + onChange={(_event, state) => this.toggleSwitch(control, state)} disabled={!this.isEnabled(control)} /> ]; } - changeDropDown(_control: ControlUI, _newState: string) { - + changeDropDown(control: ControlUI, newState: string) { + this.props.onChangeState(control.topic, newState); } renderDropDown(control: ControlUI) { @@ -125,8 +127,8 @@ export default class UiItemList extends React.Component { return ( {control.text} - this.changeDropDown(control, event.target.value)} disabled={!this.isEnabled(control)} input={} > diff --git a/src/utils/keyOf.js b/src/utils/keyOf.js new file mode 100644 index 0000000..ac15802 --- /dev/null +++ b/src/utils/keyOf.js @@ -0,0 +1,8 @@ +// @flow +import _ from "lodash"; + +const keyOf = (map: Map, value: b): ?a => ( + _.findKey(map, (x) => x === value) +); + +export default keyOf; From bcb35877c1050a369e196fd17ddf53e9eb8a2931 Mon Sep 17 00:00:00 2001 From: uwap Date: Sat, 11 Nov 2017 05:44:04 +0100 Subject: [PATCH 09/26] Fix the icon color + allow changing icons depending on the state --- .gitignore | 2 +- config/rzl.js | 6 +++--- src/components/App.js | 7 ++++++- src/components/ControlMap.js | 11 ++++++++--- src/components/SideBar.js | 7 ++++--- src/utils/parseIconName.js | 15 +++++++++++++++ types/types.js | 12 ++++++++++-- 7 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0a03045..b947077 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ node_modules/ -public/ +dist/ diff --git a/config/rzl.js b/config/rzl.js index 088e479..2205e6d 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -150,7 +150,7 @@ const config : Config = { twinkle: { name: "Twinkle", position: [530, 560], - icon: "led-off flip-v", + icon: ({twinkle}) => twinkle == "on" ? "led-on flip-v" : "led-off flip-v", iconColor: ({twinkle}) => twinkle == "on" ? utils.rainbow : "#000000", ui: [ { @@ -236,7 +236,7 @@ const config : Config = { iconColor: ({artnet}) => ({ off: "#000000", - yellow: "#CCCC00", + yellow: "#F0DF10", red: "#FF0000", purple: "#FF00FF", green: "#00FF00", @@ -350,7 +350,7 @@ const config : Config = { name: "Rundumleuchte", position: [310,275], icon: "alarm-light", - iconColor: ({rundumleuchte}) => rundumleuchte == "on" ? "#CCCC00" : "#000000", + iconColor: ({rundumleuchte}) => rundumleuchte == "on" ? "#F0DF10" : "#000000", ui: [ { type: "toggle", diff --git a/src/components/App.js b/src/components/App.js index 87e77e9..1c79060 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -13,6 +13,7 @@ import TopBar from "components/TopBar"; import UiItemList from "components/UiItemList"; import keyOf from "utils/keyOf"; +import { controlGetIcon } from "utils/parseIconName"; export type AppProps = { config: Config @@ -79,11 +80,15 @@ class App extends React.Component { {this.state.selectedControl == null || } + onChangeState={this.changeState.bind(this)} + />} diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index 1cf65a6..ac418f4 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -3,7 +3,7 @@ import React from "react"; import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet"; import Leaflet from "leaflet"; import _ from "lodash"; -import parseIconName from "utils/parseIconName"; +import parseIconName, { controlGetIcon } from "utils/parseIconName"; export type Point = [number, number]; @@ -47,7 +47,8 @@ export default class ControlMap extends React.Component { } createLeafletIcon(control: Control) { - const iconClass = parseIconName(`${control.icon} 36px`); + const icon = controlGetIcon(control, this.props.state); + const iconClass = parseIconName(`${icon} 36px`); return Leaflet.divIcon({ iconSize: Leaflet.point(36, 36), iconAnchor: Leaflet.point(18, 18), @@ -60,7 +61,11 @@ export default class ControlMap extends React.Component { if (control.iconColor == null) { return "#000"; } - return control.iconColor(this.props.state); + return control.iconColor( + _.mapValues(this.props.state, (x) => x.internal || x.actual), + _.mapValues(this.props.state, (x) => x.actual), + this.props.state + ); } renderMarker(control: Control, key: string) { diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 33d77bc..1aadfa6 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -13,7 +13,8 @@ import { renderIcon } from "utils/parseIconName"; export type SideBarProps = { control: ?Control, open: boolean, - onCloseRequest: () => void + onCloseRequest: () => void, + icon?: ?string }; export type SideBarState = { @@ -49,8 +50,8 @@ class SideBar extends React.Component { > - {this.props.control == null - || renderIcon(this.props.control.icon, "mdi-36px")} + {this.props.icon == null + || renderIcon(this.props.icon, "mdi-36px")} {this.props.control == null || this.props.control.name} diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js index 9aa5285..f4d172e 100644 --- a/src/utils/parseIconName.js +++ b/src/utils/parseIconName.js @@ -1,5 +1,6 @@ // @flow import React from "react"; +import _ from "lodash"; export default function parseIconName(name: string): string { return `mdi ${name.split(" ").map((icon) => "mdi-".concat(icon)).join(" ")}`; @@ -8,3 +9,17 @@ export default function parseIconName(name: string): string { export const renderIcon = (name: string, extraClass?: string) => { return ; }; + +export const controlGetIcon = (control: Control, state: State): string => { + return typeof control.icon !== "function" ? control.icon + : control.icon( + _.mapValues(state, (x) => x.internal || x.actual), + _.mapValues(state, (x) => x.actual), + state + ); +}; + +export const renderControlIcon = (control: Control, + state: State, extraClass?: string) => { + return renderIcon(controlGetIcon(control, state), extraClass); +}; diff --git a/types/types.js b/types/types.js index 4842319..cff9509 100644 --- a/types/types.js +++ b/types/types.js @@ -42,8 +42,16 @@ declare type ControlUI = { declare type Control = { name: string, position: Array, - icon: string, - iconColor?: (state: State) => string, + icon: string | ( + internals: Map, + actuals: Map, + state: State + ) => string, + iconColor?: ( + internals: Map, + actuals: Map, + state: State + ) => string, ui: Array }; declare type Controls = Map; From a33474d8937c06f1f0073ad6dfee1cd4748a26a1 Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 12 Nov 2017 15:52:24 +0100 Subject: [PATCH 10/26] Working mqtt setup --- config/rzl.js | 14 ++++----- css/styles.css | 5 ++++ package.json | 2 +- src/components/App.js | 41 +++++++++++++++++++++----- src/components/UiItemList.js | 29 +++++++++++++++++- src/connectMqtt.js | 57 ++++++++++++++++++++++++++++++++++++ src/mqtt.js | 35 ---------------------- src/utils/parseIconName.js | 2 +- yarn.lock | 2 +- 9 files changed, 134 insertions(+), 53 deletions(-) create mode 100644 src/connectMqtt.js delete mode 100644 src/mqtt.js diff --git a/config/rzl.js b/config/rzl.js index 2205e6d..85e4ee5 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -61,8 +61,8 @@ const config : Config = { onkyo_connection: { state: "/service/onkyo/connected", command: "", - defaultValue: 0, - values: { disconnected: 0, connecting: 1, connected: 2 }, + defaultValue: "0", + values: { disconnected: "0", connecting: "1", connected: "2" }, }, onkyo_power: { state: "/service/onkyo/status/system-power", @@ -279,7 +279,7 @@ const config : Config = { text: "Power", icon: "power", topic: "onkyo_power", - enableCondition: (a, b, state) => state.onkyo_connection == "connected" + enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" }, { type: "section", @@ -292,14 +292,14 @@ const config : Config = { min: 0, max: 50, icon: "volume-high", - enableCondition: (a, b, state) => state.onkyo_connection == "connected" + enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" }, { type: "toggle", text: "Mute", topic: "onkyo_mute", icon: "volume-off", - enableCondition: (a, b, state) => state.onkyo_connection == "connected" + enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" }, { type: "section", @@ -316,7 +316,7 @@ const config : Config = { pult: "Pult" }, icon: "usb", - enableCondition: (a, b, state) => state.onkyo_connection == "connected" + enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" }, { type: "dropDown", @@ -333,7 +333,7 @@ const config : Config = { somafm_lush: "Lush (SomaFM)" }, icon: "radio", - enableCondition: (a, b, state) => state.onkyo_connection == "connected" && state.onkyo_inputs == "netzwerk" + enableCondition: (a, b, state) => state.onkyo_connection.inernal == "connected" && state.onkyo_inputs.internal == "netzwerk" }, { type: "section", diff --git a/css/styles.css b/css/styles.css index c209e4e..b6703e2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -20,3 +20,8 @@ body .leaflet-div-icon { width: auto; height: auto; } +.mdi:before { + background-clip: text; + -webkit-background-clip: text; + background: var(--before-background, transparent); +} diff --git a/package.json b/package.json index 9c92663..a0a9063 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "material-ui": "next", "material-ui-old": "npm:material-ui@latest", "mdi": "^2.0.46", - "mqtt": "^2.11.0", + "mqtt": "^2.14.0", "ramda": "^0.24.1", "react": "^16.0.0", "react-dom": "^16.0.0", diff --git a/src/components/App.js b/src/components/App.js index 1c79060..d502a8f 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -15,6 +15,8 @@ import UiItemList from "components/UiItemList"; import keyOf from "utils/keyOf"; import { controlGetIcon } from "utils/parseIconName"; +import connectMqtt from "../connectMqtt"; + export type AppProps = { config: Config }; @@ -22,7 +24,8 @@ export type AppProps = { export type AppState = { selectedControl: ?Control, drawerOpened: boolean, - mqttState: State + mqttState: State, + mqttSend: (topic: string, value: any) => void }; class App extends React.Component { @@ -34,7 +37,11 @@ class App extends React.Component { mqttState: _.mapValues(props.config.topics, (topic) => ({ actual: topic.defaultValue, internal: keyOf(topic.values, topic.defaultValue) - })) + })), + mqttSend: connectMqtt(props.config.space.mqtt, { + onMessage: this.receiveMessage.bind(this), + subscribe: _.map(props.config.topics, (x) => x.state) + }) }; } @@ -54,6 +61,23 @@ class App extends React.Component { }); } + receiveMessage(rawTopic: string, message: Object) { + const topic = _.findKey( + this.props.config.topics, + (v) => v.state === rawTopic + ); + if (topic == null) { + return; + } + const parseValue = this.props.config.topics[topic].parseState; + const value = parseValue == null ? message.toString() : parseValue(message); + this.setState({mqttState: _.merge(this.state.mqttState, + { [topic]: { + actual: value, + internal: keyOf(this.props.config.topics[topic].values, value) || value + }})}); + } + changeControl(control: ?Control = null) { this.setState({selectedControl: control, drawerOpened: control != null}); } @@ -63,11 +87,14 @@ class App extends React.Component { } changeState(topic: string, value: any) { - this.setState({mqttState: _.merge(this.state.mqttState, - { [topic]: { - actual: this.props.config.topics[topic].values[value], - internal: value - }})}); + const rawTopic = this.props.config.topics[topic].command; + if (rawTopic == null) { + return; + } + this.state.mqttSend( + rawTopic, + String(this.props.config.topics[topic].values[value] || value) + ); } render() { diff --git a/src/components/UiItemList.js b/src/components/UiItemList.js index 0cde9a9..4160ce5 100644 --- a/src/components/UiItemList.js +++ b/src/components/UiItemList.js @@ -16,6 +16,10 @@ import Select from "material-ui/Select"; import { MenuItem } from "material-ui/Menu"; import Button from "material-ui/Button"; +// TODO: Use something else +import Slider from "material-ui-old/Slider"; +import MuiThemeProvider from "material-ui-old/styles/MuiThemeProvider"; + export type UiItemListProps = { controls: Array, state: State, @@ -61,6 +65,9 @@ export default class UiItemList extends React.Component { case "link": { return this.renderLink(control); } + case "slider": { + return this.renderSlider(control); + } default: { throw new Error( `Unknown UI type "${control.type}" for "${control.text}" component` @@ -127,7 +134,7 @@ export default class UiItemList extends React.Component { return ( {control.text} - } @@ -159,4 +166,24 @@ export default class UiItemList extends React.Component { ); } + + renderSlider(control: ControlUI) { + const value = this.getValue(control); + return [ + , + + + + this.props.onChangeState(control.topic, newvalue) + } + style={{width: 100}} + /> + + ]; + } } diff --git a/src/connectMqtt.js b/src/connectMqtt.js new file mode 100644 index 0000000..d7b2f93 --- /dev/null +++ b/src/connectMqtt.js @@ -0,0 +1,57 @@ +// @flow +import mqtt from "mqtt"; + +// TODO: type mqtt.js + +export type MqttSettings = { + onReconnect?: (mqtt: Object) => void, + onDisconnect?: (mqtt: Object) => void, + onMessage?: (topic: string, message: Object) => void, + onMessageSent?: (topic: string, message: any) => void, + onConnect?: (mqtt: Object) => void, + subscribe?: Array +} + +export type MessageCallback = (topic: string, message: any) => void; + +export default function connectMqtt( + url: string, + settings: MqttSettings = {} +): MessageCallback { + const client = mqtt.connect(url); + client.on("connect", () => { + if (settings.subscribe != null) { + client.subscribe(settings.subscribe); + } + if (settings.onConnect != null) { + settings.onConnect(client); + } + }); + client.on("message", (topic, message) => { + if (settings.onMessage != null) { + settings.onMessage(topic, message); + } + }); + client.on("offline", () => { + if (settings.onDisconnect != null) { + settings.onDisconnect(client); + } + }); + client.on("close", () => { + if (settings.onDisconnect != null) { + settings.onDisconnect(client); + } + }); + client.on("reconnect", () => { + if (settings.onReconnect != null) { + settings.onReconnect(client); + } + }); + return (topic: string, message: any) => { + client.publish(topic, message, null, (error) => { + if (error == null && settings.onMessageSent != null) { + settings.onMessageSent(topic, message); + } + }); + }; +} diff --git a/src/mqtt.js b/src/mqtt.js deleted file mode 100644 index 6ec04e4..0000000 --- a/src/mqtt.js +++ /dev/null @@ -1,35 +0,0 @@ -// @flow -import mqtt from "mqtt"; -import { Actions } from "./state"; -import { Store } from "redux"; -import Config from "./config"; -import R from "ramda"; - -export default function connectMqtt(url: string, store: Store<*, *>) { - const client = mqtt.connect(url); - client.on("connect", () => { - store.dispatch({ - type: Actions.MQTT_CONNECT, payload: client - }); - R.forEachObjIndexed((v) => - client.subscribe(v.state), Config.topics); - }); - client.on("message", (topic, message) => { - store.dispatch({ - type: Actions.MQTT_MESSAGE, - payload: { - message: message, - topic: topic - } - }); - }); - client.on("offline", () => { - store.dispatch({ type: null }); - }); - client.on("close", () => { - store.dispatch({ type: null }); - }); - client.on("reconnect", () => { - store.dispatch({ type: null }); - }); -} diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js index f4d172e..265d0a4 100644 --- a/src/utils/parseIconName.js +++ b/src/utils/parseIconName.js @@ -11,7 +11,7 @@ export const renderIcon = (name: string, extraClass?: string) => { }; export const controlGetIcon = (control: Control, state: State): string => { - return typeof control.icon !== "function" ? control.icon + return !_.isFunction(control.icon) ? control.icon : control.icon( _.mapValues(state, (x) => x.internal || x.actual), _.mapValues(state, (x) => x.actual), diff --git a/yarn.lock b/yarn.lock index 632662c..2880571 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3815,7 +3815,7 @@ mqtt-packet@^5.4.0: process-nextick-args "^1.0.7" safe-buffer "^5.1.0" -mqtt@^2.11.0: +mqtt@^2.14.0: version "2.14.0" resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-2.14.0.tgz#640b712e3c3c02ebe97882b109499bffc65f97a8" dependencies: From 4960da7ec6d8d351c9ff172cad7912d6195c7f9f Mon Sep 17 00:00:00 2001 From: uwap Date: Mon, 13 Nov 2017 14:04:17 +0100 Subject: [PATCH 11/26] Clean up refactor branch --- package.json | 5 +- src/UiItems.js | 149 ---------------------------------------------- src/appbar.js | 43 -------------- src/map.js | 83 -------------------------- src/state.js | 81 ------------------------- src/util.js | 5 -- yarn.lock | 158 +++++++++++++++++++++---------------------------- 7 files changed, 69 insertions(+), 455 deletions(-) delete mode 100644 src/UiItems.js delete mode 100644 src/appbar.js delete mode 100644 src/map.js delete mode 100644 src/state.js delete mode 100644 src/util.js diff --git a/package.json b/package.json index a0a9063..2a6ab62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "spacemap", + "name": "mqtt-control-map", "version": "1.0.0", - "author": "uwap ", + "author": "uwap ", "description": "control devices via mqtt on a beautiful map of your space", "scripts": { "build": "webpack --bail --config webpack.dev.js", @@ -19,7 +19,6 @@ "material-ui-old": "npm:material-ui@latest", "mdi": "^2.0.46", "mqtt": "^2.14.0", - "ramda": "^0.24.1", "react": "^16.0.0", "react-dom": "^16.0.0", "react-leaflet": "^1.5.0", diff --git a/src/UiItems.js b/src/UiItems.js deleted file mode 100644 index fb54a15..0000000 --- a/src/UiItems.js +++ /dev/null @@ -1,149 +0,0 @@ -// @flow -import React from "react"; -import Switch from "material-ui/Switch"; -import Select from "material-ui/Select"; -import { MenuItem } from "material-ui/Menu"; -import Slider from "material-ui-old/Slider"; -import MuiThemeProvider from "material-ui-old/styles/MuiThemeProvider"; -import Config from "./config"; -import Input, { InputLabel } from "material-ui/Input"; -import { FormControl } from "material-ui/Form"; -import R from "ramda"; -import { - ListItem, - ListItemIcon, - ListItemSecondaryAction, - ListItemText, - ListSubheader -} from "material-ui/List"; -import Button from "material-ui/Button"; - -const enabled = (props: ControlUI, state: State) => { - if (props.enableCondition == null) { - return true; - } else { - const val = state.values[props.topic]; - return props.enableCondition( - val.internal == null ? val.actual : val.internal, val.actual, - R.map((x) => (x.internal == null ? x.actual - : x.internal), state.values == null ? {} : state.values)); - } -}; - -const getValue = (topic: string, val: string) => - Config.topics[topic].values[val]; - -const renderIcon = (icon: string) => { - if (icon != null) { - return ( - - - - ); - } - return null; -}; - -export const onSwitch = (topic: string, props: ControlUI, state: State) => - (x, toggled: boolean) => { - if (state.mqtt != null) { - state.mqtt.publish(Config.topics[topic].command, - toggled ? getValue(topic, R.propOr("on", "on", props)) - : getValue(topic, R.propOr("off", "off", props))); - } - }; - -export const isToggled = (state: State, props: ControlUI) => { - const val = state.values[props.topic]; - if (props.toggled != null) { - return props.toggled(val.internal == null ? val.actual : val.internal, - val.actual); - } else { - return val.internal === R.propOr("on", "on", props); - } -}; - -export const toggle = (state: State, props: ControlUI) => { - return ( - - {renderIcon(props.icon)} - - - - - - ); -}; - -const onDropDownChange = (topic: string, props: ControlUI, state: State) => - (event) => { - if (state.mqtt != null) { - state.mqtt.publish(Config.topics[topic].command, event.target.value); - } - }; - -const dropDownItem = (topic: string) => (text: string, key: string) => ( - {text} -); - -export const dropDown = (state: State, props: ControlUI) => { - const id = `${props.topic}.${Object.keys(props.options) - .reduce((v, r) => v + "." + r)}`; - return ( - - {renderIcon(props.icon)} - - {props.text} - - - - ); -}; - -const onSliderChange = (state: State, props: ControlUI) => - (event, value) => { - if (state.mqtt != null) { - state.mqtt.publish(Config.topics[props.topic].command, value.toString()); - } - }; - -export const slider = (state: State, props: ControlUI) => ( - - {renderIcon(props.icon)} - - - - - - -); - -export const section = (state: State, props: ControlUI) => ( - {props.text} -); - -export const link = (state: State, props: ControlUI) => ( - - - -); diff --git a/src/appbar.js b/src/appbar.js deleted file mode 100644 index d889d3b..0000000 --- a/src/appbar.js +++ /dev/null @@ -1,43 +0,0 @@ -// @flow -import React from "react"; -import AppBar from "material-ui/AppBar"; -import Toolbar from "material-ui/Toolbar"; -import { CircularProgress } from "material-ui/Progress"; -import IconButton from "material-ui/IconButton"; -import Typography from "material-ui/Typography"; - -const TopBarLayerSelector = (_props: Object) => ( - - - -); - -const TopBarIndicatorMenu = (props: Object) => ( - - {props.mqtt.connected ? - () : - ()} - -); - - -const TopBarIndicator = (props: Object) => { - if (props.mqtt == null || props.mqtt.reconnecting) { - return (); - } else { - return (); - } -}; - -const TopBar = (props: Object) => ( - - - - {props.title} - {false && } - - -); - -export default TopBar; diff --git a/src/map.js b/src/map.js deleted file mode 100644 index ebed3e5..0000000 --- a/src/map.js +++ /dev/null @@ -1,83 +0,0 @@ -// @flow -import React from "react"; -import { Map, ImageOverlay, Marker, LayersControl } from "react-leaflet"; -import Leaflet from "leaflet"; -import R from "ramda"; -import Config from "./config"; -import { Actions } from "./state"; -import { store } from "./state"; - -// convert width/height coordinates to -height/width coordinates -const c = (p) => [-p[1], p[0]]; - -const color = (iconColor, state: State) => { - // TODO: give iconColor not only internal but also actual values - return iconColor == null ? "#000000" : - iconColor( - R.map((x) => (x.internal == null ? - x.actual : x.internal), state.values == null ? {} : state.values) - ); -}; -const iconHtml = (el, state: State) => - "" - + ""; - -const Markers = (props) => R.values(R.mapObjIndexed((el, key) => ( - store.dispatch({ - type: Actions.CHANGE_UI, - payload: key, - toggle: e.originalEvent.ctrlKey})}> - -), R.propOr({}, "controls", Config))); - -type SpaceMapProps = { - state: State, - width: number, - height: number, - zoom: number, - image: string -}; - -class SpaceMap extends React.Component { - - constructor(props: SpaceMapProps) { - super(props); - } - - render() { - const props = this.props; - return ( - - {Markers(props)} - - {Config.layers.map((x) => - this.renderLayer(x, [c([0, 0]), c([props.width, props.height])]))} - - - ); - } - - renderLayer(layer, bounds) { - const LayersControlType = - layer.baseLayer ? LayersControl.BaseLayer : LayersControl.Overlay; - return ( - - - - ); - } -} - -export default SpaceMap; diff --git a/src/state.js b/src/state.js deleted file mode 100644 index e64b31d..0000000 --- a/src/state.js +++ /dev/null @@ -1,81 +0,0 @@ -// @flow -import R from "ramda"; -import { createStore } from "redux"; -import Config from "./config"; -import { keyOf } from "./util"; -import { onSwitch, isToggled } from "./UiItems"; - -export const Actions = Object.freeze({ - MQTT_CONNECT: "CONNECT", - MQTT_MESSAGE: "MESSAGE", - CHANGE_UI: "UI_POPUP" -}); - -const initState : State = { - mqtt: null, - uiOpened: null, - values: R.map( - (topic) => { - return { - internal: keyOf(topic.values, topic.defaultValue), - actual: topic.defaultValue - }; - }, Config.topics), - visibleLayers: [] -}; - -const onMessage = (state: State, action: StateAction) => { - if (action.payload == null) { - return state; - } - - /* - * action.payload.topic is the mqtt topic - * topics is the list of all internal topic references - * that have their state topic set to action.payload.topic - */ - const payload = action.payload == null ? { topic: "", message: {} } - : action.payload; // thx flow val.state === payload.topic, Config.topics)); - const message = payload.message; - const parsedMessage = (topic: string) => { - let parseFunction = Config.topics[topic].parseState; - if (parseFunction == null) { - return message.toString(); - } else { - return parseFunction(message); - } - }; - const newValue = (topic: string) => { - return { - actual: parsedMessage(topic), - internal: keyOf(Config.topics[topic].values, parsedMessage(topic)) - }; - }; - return R.mergeDeepRight(state, R.objOf("values", R.mergeAll( - R.map((topic) => R.objOf(topic, newValue(topic)), topics) - ))); -}; - -const match = (value: any, array: Map) => array[value]; -const handleEvent = (state: State = initState, action: StateAction) => { - return match(action.type, { - [Actions.MQTT_CONNECT]: R.merge(state, { mqtt: action.payload }), - [Actions.MQTT_MESSAGE]: onMessage(state, action), - [Actions.CHANGE_UI]: (() => { - const control = Config.controls[action.payload]; - if (action.toggle && control.ui.length > 0 - && control.ui[0].type === "toggle") { - const props = control.ui[0]; - onSwitch(props.topic, props, state)(null, !isToggled(state, props)); - return state; - } else { - return R.merge(state, { uiOpened: action.payload }); - } - })(), - [null]: state - }); -}; - -export const store = createStore(handleEvent, initState); diff --git a/src/util.js b/src/util.js deleted file mode 100644 index 75cb598..0000000 --- a/src/util.js +++ /dev/null @@ -1,5 +0,0 @@ -// @flow -import R from "ramda"; - -export const keyOf = (map: Map, value: a): ?b => - ((keys) => keys[R.findIndex((k) => map[k] === value, keys)])(R.keys(map)); diff --git a/yarn.lock b/yarn.lock index 2880571..b2b973e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,54 +2,53 @@ # yarn lockfile v1 -"@babel/code-frame@7.0.0-beta.31", "@babel/code-frame@^7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.31.tgz#473d021ecc573a2cce1c07d5b509d5215f46ba35" +"@babel/code-frame@7.0.0-beta.32", "@babel/code-frame@^7.0.0-beta.31": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.32.tgz#04f231b8ec70370df830d9926ce0f5add074ec4c" dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/helper-function-name@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.31.tgz#afe63ad799209989348b1109b44feb66aa245f57" +"@babel/helper-function-name@7.0.0-beta.32": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz#6161af4419f1b4e3ed2d28c0c79c160e218be1f3" dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.31" - "@babel/template" "7.0.0-beta.31" - "@babel/traverse" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" + "@babel/helper-get-function-arity" "7.0.0-beta.32" + "@babel/template" "7.0.0-beta.32" + "@babel/types" "7.0.0-beta.32" -"@babel/helper-get-function-arity@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.31.tgz#1176d79252741218e0aec872ada07efb2b37a493" +"@babel/helper-get-function-arity@7.0.0-beta.32": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz#93721a99db3757de575a83bab7c453299abca568" dependencies: - "@babel/types" "7.0.0-beta.31" + "@babel/types" "7.0.0-beta.32" -"@babel/template@7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.31.tgz#577bb29389f6c497c3e7d014617e7d6713f68bda" +"@babel/template@7.0.0-beta.32": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.32.tgz#e1d9fdbd2a7bcf128f2f920744a67dab18072495" dependencies: - "@babel/code-frame" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" - babylon "7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.32" + "@babel/types" "7.0.0-beta.32" + babylon "7.0.0-beta.32" lodash "^4.2.0" -"@babel/traverse@7.0.0-beta.31", "@babel/traverse@^7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.31.tgz#db399499ad74aefda014f0c10321ab255134b1df" +"@babel/traverse@^7.0.0-beta.31": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.32.tgz#b78b754c6e1af3360626183738e4c7a05951bc99" dependencies: - "@babel/code-frame" "7.0.0-beta.31" - "@babel/helper-function-name" "7.0.0-beta.31" - "@babel/types" "7.0.0-beta.31" - babylon "7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.32" + "@babel/helper-function-name" "7.0.0-beta.32" + "@babel/types" "7.0.0-beta.32" + babylon "7.0.0-beta.32" debug "^3.0.1" globals "^10.0.0" invariant "^2.2.0" lodash "^4.2.0" -"@babel/types@7.0.0-beta.31", "@babel/types@^7.0.0-beta.31": - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.31.tgz#42c9c86784f674c173fb21882ca9643334029de4" +"@babel/types@7.0.0-beta.32", "@babel/types@^7.0.0-beta.31": + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.32.tgz#c317d0ecc89297b80bbcb2f50608e31f6452a5ff" dependencies: esutils "^2.0.2" lodash "^4.2.0" @@ -86,7 +85,7 @@ acorn@^4.0.3: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.0, acorn@^5.1.1: +acorn@^5.0.0, acorn@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" @@ -101,7 +100,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3: +ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda" dependencies: @@ -862,9 +861,9 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" -babylon@7.0.0-beta.31, babylon@^7.0.0-beta.31: - version "7.0.0-beta.31" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.31.tgz#7ec10f81e0e456fd0f855ad60fa30c2ac454283f" +babylon@7.0.0-beta.32, babylon@^7.0.0-beta.31: + version "7.0.0-beta.32" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e" babylon@^6.18.0: version "6.18.0" @@ -994,10 +993,6 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" -brcast@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.2.tgz#2db16de44140e418dc37fab10beec0369e78dcef" - brcast@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd" @@ -1066,10 +1061,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.8.0.tgz#27d64028130a2e8585ca96f7c3b7730eff4de493" + version "2.9.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.0.tgz#706aca15c53be15610f466e348cbfa0c00a6a379" dependencies: - caniuse-lite "^1.0.30000758" + caniuse-lite "^1.0.30000760" electron-to-chromium "^1.3.27" buffer-indexof@^1.0.0: @@ -1164,7 +1159,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000760" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d" -caniuse-lite@^1.0.30000758: +caniuse-lite@^1.0.30000760: version "1.0.30000760" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff" @@ -1475,14 +1470,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.0: - version "15.6.2" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -2036,10 +2023,10 @@ eslint-scope@^3.7.1: estraverse "^4.1.1" eslint@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.10.0.tgz#f25d0d7955c81968c2309aa5c9a229e045176bb7" + version "4.11.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.11.0.tgz#39a8c82bc0a3783adf5a39fa27fdd9d36fac9a34" dependencies: - ajv "^5.2.0" + ajv "^5.3.0" babel-code-frame "^6.22.0" chalk "^2.1.0" concat-stream "^1.6.0" @@ -2047,7 +2034,7 @@ eslint@^4.10.0: debug "^3.0.1" doctrine "^2.0.0" eslint-scope "^3.7.1" - espree "^3.5.1" + espree "^3.5.2" esquery "^1.0.0" estraverse "^4.2.0" esutils "^2.0.2" @@ -2060,7 +2047,7 @@ eslint@^4.10.0: inquirer "^3.0.6" is-resolvable "^1.0.0" js-yaml "^3.9.1" - json-stable-stringify "^1.0.1" + json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" lodash "^4.17.4" minimatch "^3.0.2" @@ -2077,11 +2064,11 @@ eslint@^4.10.0: table "^4.0.1" text-table "~0.2.0" -espree@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.1.tgz#0c988b8ab46db53100a1954ae4ba995ddd27d87e" +espree@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" dependencies: - acorn "^5.1.1" + acorn "^5.2.1" acorn-jsx "^3.0.0" esprima@^2.6.0: @@ -2269,7 +2256,7 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" -fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.6, fbjs@^0.8.9: +fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.6: version "0.8.16" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: @@ -2449,11 +2436,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" @@ -3327,6 +3314,10 @@ json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" @@ -3919,7 +3910,7 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" -node-pre-gyp@^0.6.36: +node-pre-gyp@^0.6.39: version "0.6.39" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: @@ -4288,8 +4279,8 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" popper.js@^1.12.5: - version "1.12.6" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.6.tgz#91e12a97b07815258b76915d64044e8ac053d426" + version "1.12.7" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.7.tgz#b8d225618e5d95e27ac2b591debf581857a9c16d" portfinder@^1.0.9: version "1.0.13" @@ -4696,10 +4687,6 @@ rafl@~1.2.1: dependencies: global "~4.3.0" -ramda@^0.24.1: - version "0.24.1" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857" - randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -4775,8 +4762,8 @@ react-jss@^7.2.0: theming "^1.1.0" react-leaflet@^1.5.0: - version "1.7.3" - resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.7.3.tgz#4575bce582c0e3745019076d5b804ffcd0efd6bb" + version "1.7.4" + resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.7.4.tgz#073202401b5804cb00e97adf0768d1b2e3b7c9e9" dependencies: lodash "^4.0.0" lodash-es "^4.0.0" @@ -4824,16 +4811,6 @@ react-transition-group@^2.2.1: prop-types "^15.5.8" warning "^3.0.0" -react@^15.5.4: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" - dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" - loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" - react@^16.0.0: version "16.1.0" resolved "https://registry.yarnpkg.com/react/-/react-16.1.0.tgz#1c2bdac3c17fe7ee9282fa35aca6cc36387903e1" @@ -5590,14 +5567,13 @@ text-table@~0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" theming@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/theming/-/theming-1.1.0.tgz#0562760b55a1b919c2d5eeb94130351f8958e13a" + version "1.2.1" + resolved "https://registry.yarnpkg.com/theming/-/theming-1.2.1.tgz#3de0be696339c6c203013a6c68d1c1057973dc44" dependencies: - brcast "^2.0.0" + brcast "^3.0.1" is-function "^1.0.1" is-plain-object "^2.0.1" prop-types "^15.5.8" - react "^15.5.4" through2-filter@^2.0.0: version "2.0.0" @@ -5723,8 +5699,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-js@3.1.x: - version "3.1.8" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.8.tgz#780d08b4f6782fe36ea5484d952362eddaf1d7b8" + version "3.1.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.9.tgz#dffca799308cf327ec3ac77eeacb8e196ce3b452" dependencies: commander "~2.11.0" source-map "~0.6.1" @@ -6020,8 +5996,8 @@ websocket-driver@>=0.5.1: websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.2.tgz#0e18781de629a18308ce1481650f67ffa2693a5d" + version "0.1.3" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" websocket-stream@^5.0.1: version "5.1.1" From 9e45e7f398e2ff2d763d108612c64e30ab83dda5 Mon Sep 17 00:00:00 2001 From: uwap Date: Mon, 13 Nov 2017 14:10:45 +0100 Subject: [PATCH 12/26] Hopefully fix the build --- webpack.prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.prod.js b/webpack.prod.js index 20b0ad3..22c30b3 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -18,7 +18,7 @@ const extractCSS = ExtractTextPlugin.extract({ module.exports = merge(common, { entry: { main: path.resolve(__dirname, 'src/index.jsx'), - vendor: ['react', 'material-ui', 'mqtt', 'ramda'] + vendor: ['react', 'material-ui', 'mqtt', 'lodash'] }, module: { loaders: [ From 48e95729256167e75fe7b12486887ebd0f2cb3f8 Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 14 Nov 2017 13:13:31 +0100 Subject: [PATCH 13/26] Fix some flow errors --- .flowconfig | 2 ++ src/components/ControlMap.js | 22 +++++++++++----------- src/utils/parseIconName.js | 2 +- types/types.js | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.flowconfig b/.flowconfig index da47905..83cd117 100644 --- a/.flowconfig +++ b/.flowconfig @@ -9,6 +9,8 @@ types/types.js [options] esproposal.export_star_as=enable unsafe.enable_getters_and_setters=true +module.system.node.resolve_dirname=node_modules +module.system.node.resolve_dirname=src [lints] all=warn diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index ac418f4..81dafcd 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -7,7 +7,7 @@ import parseIconName, { controlGetIcon } from "utils/parseIconName"; export type Point = [number, number]; -const convertPoint = (p: Point) => [-p[1], p[0]]; +const convertPoint = ([y,x]: Point): Point => [-x, y]; export type ControlMapProps = { width: number, @@ -20,7 +20,7 @@ export type ControlMapProps = { }; export default class ControlMap extends React.Component { - constructor(props: SpaceMapProps) { + constructor(props: ControlMapProps) { super(props); } @@ -57,15 +57,15 @@ export default class ControlMap extends React.Component { }); } - iconColor(control: Control) { - if (control.iconColor == null) { - return "#000"; + iconColor(control: Control): string { + if (control.iconColor != null) { + return control.iconColor( + _.mapValues(this.props.state, (x) => x.internal || x.actual), + _.mapValues(this.props.state, (x) => x.actual), + this.props.state + ); } - return control.iconColor( - _.mapValues(this.props.state, (x) => x.internal || x.actual), - _.mapValues(this.props.state, (x) => x.actual), - this.props.state - ); + return "#000"; } renderMarker(control: Control, key: string) { @@ -97,7 +97,7 @@ export default class ControlMap extends React.Component { checked={layer.defaultVisibility === "visible"}> + opacity={layer.opacity || 1} /> ); } diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js index 265d0a4..f4d172e 100644 --- a/src/utils/parseIconName.js +++ b/src/utils/parseIconName.js @@ -11,7 +11,7 @@ export const renderIcon = (name: string, extraClass?: string) => { }; export const controlGetIcon = (control: Control, state: State): string => { - return !_.isFunction(control.icon) ? control.icon + return typeof control.icon !== "function" ? control.icon : control.icon( _.mapValues(state, (x) => x.internal || x.actual), _.mapValues(state, (x) => x.actual), diff --git a/types/types.js b/types/types.js index cff9509..75b0f29 100644 --- a/types/types.js +++ b/types/types.js @@ -14,7 +14,7 @@ declare type Topic = { declare type Topics = Map; declare type ControlUI = { - type: "toggle" | "dropDown" | "slider" | "section", + type: "toggle" | "dropDown" | "slider" | "section" | "link", text: string, topic?: string, icon?: string, @@ -66,10 +66,15 @@ declare type Config = { declare type Space = { name: string, color: "red"|"pink"|"purple"|"deepPurple"|"indigo"|"blue"|"lightBlue"|"cyan"|"teal"| - "green"|"lightgreen"|"lime"|"yellow"|"amber"|"orange"|"deepOrange"|"brown"|"grey"|"blueGrey" + "green"|"lightGreen"|"lime"|"yellow"|"amber"|"orange"|"deepOrange"|"brown"|"grey"|"blueGrey", + mqtt: string }; -declare type State = Map; +declare type StateValue = { + internal: string, + actual: any +}; +declare type State = Map; //declare type State = { // mqtt: ?any, @@ -89,16 +94,11 @@ declare type Point = [number, number]; declare type Layer = { image: string, name: string, - baseLayer: boolean, + baseLayer?: boolean, defaultVisibility: "visible" | "hidden", - opacity: number, + opacity?: number, bounds: { topLeft: Point, bottomRight: Point } }; - -declare type StateAction = { - type: "DISCONNECT" | "CONNECT" | "MESSAGE" | "UI_POPUP", - payload?: any -}; From 9cc827d5a618c5fe15b256cfea12abc03d481066 Mon Sep 17 00:00:00 2001 From: uwap Date: Tue, 14 Nov 2017 13:23:55 +0100 Subject: [PATCH 14/26] Fix some more flow errors --- src/index.jsx | 4 +++- src/utils/parseIconName.js | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/index.jsx b/src/index.jsx index 3e9376d..f115191 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -14,4 +14,6 @@ injectTapEventPlugin(); document.title = `${Config.space.name} Map`; -ReactDOM.render(, document.getElementById("content")); +// $FlowFixMe +const contentElement: Element = document.getElementById("content"); +ReactDOM.render(, contentElement); diff --git a/src/utils/parseIconName.js b/src/utils/parseIconName.js index f4d172e..98e82ac 100644 --- a/src/utils/parseIconName.js +++ b/src/utils/parseIconName.js @@ -11,12 +11,10 @@ export const renderIcon = (name: string, extraClass?: string) => { }; export const controlGetIcon = (control: Control, state: State): string => { + const internals = _.mapValues(state, (x) => x.internal || x.actual); + const actuals = _.mapValues(state, (x) => x.actual); return typeof control.icon !== "function" ? control.icon - : control.icon( - _.mapValues(state, (x) => x.internal || x.actual), - _.mapValues(state, (x) => x.actual), - state - ); + : control.icon(internals, actuals, state); }; export const renderControlIcon = (control: Control, From 6c7ea9dfb3f1825b6f868b3b4a1e0c6fb610ae4d Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 26 Nov 2017 16:49:41 +0100 Subject: [PATCH 15/26] Almost completely rewrite UiItems --- .babelrc | 3 + config/rzl.js | 2 +- package.json | 1 + src/components/App.js | 3 + src/components/UiItemList/UiItem.js | 176 ++++++++++++++++++ .../{UiItemList.js => UiItemList/index.js} | 18 +- types/types.js | 50 +++-- yarn.lock | 13 ++ 8 files changed, 245 insertions(+), 21 deletions(-) create mode 100644 src/components/UiItemList/UiItem.js rename src/components/{UiItemList.js => UiItemList/index.js} (89%) diff --git a/.babelrc b/.babelrc index f2bdc95..eabd309 100644 --- a/.babelrc +++ b/.babelrc @@ -2,4 +2,7 @@ "presets": [ "env", "react" ], + "plugins": [ + "transform-class-properties" + ], } diff --git a/config/rzl.js b/config/rzl.js index 85e4ee5..bfd4bbf 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -333,7 +333,7 @@ const config : Config = { somafm_lush: "Lush (SomaFM)" }, icon: "radio", - enableCondition: (a, b, state) => state.onkyo_connection.inernal == "connected" && state.onkyo_inputs.internal == "netzwerk" + enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" && state.onkyo_inputs.internal == "netzwerk" }, { type: "section", diff --git a/package.json b/package.json index 2a6ab62..96e9a85 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "babel-core": "^6.25.0", "babel-eslint": "^8.0.1", "babel-loader": "^7.1.1", + "babel-plugin-transform-class-properties": "^6.24.1", "babel-preset-react": "^6.24.1", "clean-webpack-plugin": "^0.1.17", "css-loader": "^0.28.7", diff --git a/src/components/App.js b/src/components/App.js index d502a8f..cd1b5a0 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -87,6 +87,9 @@ class App extends React.Component { } changeState(topic: string, value: any) { + // this.receiveMessage(this.props.config.topics[topic].state, String(this.props.config.topics[topic].values[value] || value)); + // return; + // const rawTopic = this.props.config.topics[topic].command; if (rawTopic == null) { return; diff --git a/src/components/UiItemList/UiItem.js b/src/components/UiItemList/UiItem.js new file mode 100644 index 0000000..82112c4 --- /dev/null +++ b/src/components/UiItemList/UiItem.js @@ -0,0 +1,176 @@ +// @flow +import React from "react"; +import _ from "lodash"; +import { + ListItem, + ListItemIcon, + ListItemSecondaryAction, + ListItemText, + ListSubheader +} from "material-ui/List"; +import Switch from "material-ui/Switch"; +import { renderIcon } from "utils/parseIconName"; +import Input, { InputLabel } from "material-ui/Input"; +import { FormControl } from "material-ui/Form"; +import Select from "material-ui/Select"; +import { MenuItem } from "material-ui/Menu"; +import Button from "material-ui/Button"; + +import keyOf from "utils/keyOf"; + +type UiItemProps = { + item: I, + state: State, + onChangeState: (topic: string, nextState: any) => void +}; + +export default class UiItem extends React.Component> { + constructor(props: UiItemProps) { + super(props); + } + + runPrimaryAction() { + + } + + changeState(next: any) { + if (this.props.item.topic == null) { + throw new Error( + `Undefined topic in ${control.type} "${control.text}"` + ); + } + this.props.onChangeState(this.props.item.topic, next); + } + + getValue() { + const topic: string = this.props.item.topic || ""; + const value = this.props.state[topic]; + if (value == null) { + throw new Error( + `Unknown topic "${control.topic}" in ${control.type} "${control.text}"` + ); + } + return value; + } + + isEnabled() { + const enableCondition = this.props.item.enableCondition; + if (enableCondition == null) { + return true; + } else { + const value = this.getValue(); + return enableCondition( + value.internal || value.actual, value.actual, this.props.state); + } + } + + render() { + return null; + } +} + +export class Toggle extends UiItem { + isToggled = () => { + const value = this.getValue(); + const control = this.props.item; + const isChecked = control.toggled || ((i) => i === (control.on || "on")); + const checked = isChecked( + value.internal || value.actual, value.actual, this.props.state); + return checked; + } + + runPrimaryAction = () => { + if (this.isEnabled()) { + const control = this.props.item; + const toggled = this.isToggled(); + const next = toggled ? (control.off || "off") : (control.on || "on"); + this.changeState(next); + } + } + + render() { + return [ + , + + + + ]; + } +} + +export class DropDown extends UiItem { + runPrimaryAction = (next?: any) => { + if (this.isEnabled()) { + const control = this.props.item; + const keys = _.keys(control.options); + const value = this.getValue(); + const valueIndex = keyOf(keys, value); + if (next == null) { + this.changeState(keys[(valueIndex + 1) % keys.length]); + } else { + this.changeState(next); + } + } + } + + render() { + const control = this.props.item; + const value = this.getValue(); + const id = `${control.topic}-${control.name}`; + const options = control.options; + if (options == null) { + throw new Error( + `Parameter "options" missing for ${control.type} "${control.text}"` + ); + } + return ( + + {control.text} + } + > + {_.map(options, (v, k) => {v})} + + + ); + } +} + +export class Link extends UiItem { + runPrimaryAction = () => { + const control = this.props.item; + if (control.link == null) { + throw new Error( + `Parameter "link" missing for ${control.type} "${control.text}"` + ); + } + if (this.isEnabled()) { + window.open(control.link, "_blank"); + } + } + + render() { + return ( + + ); + } +} + +export class Section extends UiItem { + render() { + return ( + {this.props.item.text} + ); + } +} diff --git a/src/components/UiItemList.js b/src/components/UiItemList/index.js similarity index 89% rename from src/components/UiItemList.js rename to src/components/UiItemList/index.js index 4160ce5..bba000d 100644 --- a/src/components/UiItemList.js +++ b/src/components/UiItemList/index.js @@ -20,6 +20,8 @@ import Button from "material-ui/Button"; import Slider from "material-ui-old/Slider"; import MuiThemeProvider from "material-ui-old/styles/MuiThemeProvider"; +import { Toggle, DropDown, Link, Section } from "./UiItem"; + export type UiItemListProps = { controls: Array, state: State, @@ -54,16 +56,24 @@ export default class UiItemList extends React.Component { renderControl(control: ControlUI) { switch (control.type) { case "toggle": { - return this.renderToggle(control); + return ; } case "dropDown": { - return this.renderDropDown(control); + return ; } case "section": { - return this.renderSection(control); + return
; } case "link": { - return this.renderLink(control); + return ; } case "slider": { return this.renderSlider(control); diff --git a/types/types.js b/types/types.js index 75b0f29..6e0e95c 100644 --- a/types/types.js +++ b/types/types.js @@ -13,32 +13,50 @@ declare type Topic = { }; declare type Topics = Map; -declare type ControlUI = { - type: "toggle" | "dropDown" | "slider" | "section" | "link", +declare type UIBase = { text: string, - topic?: string, - icon?: string, + topic: string, + icon?: string, + enableCondition?: (internal: string, actual: any, state: State) => boolean +} - enableCondition?: (internal: string, actual: any, state: State) => boolean, - - // LINK optiona properties - link?: string, - - // TOGGLE optional properties - on?: string, // on override for toggle - off?: string, // off override for toggle +declare type UIToggle = { + type: "toggle", + on?: string, + off?: string, toggled?: (internal: string, actual: any, state: State) => boolean, +} & UIBase; - // DROPDOWN optional properties - options?: Map, //options for dropDown - renderValue?: (value: string) => string, +declare type UIDropDown = { + type: "dropDown", + options: Map, + renderValue?: (value: string) => string +} & UIBase; - // SLIDER optional properties +declare type UISlider = { + type: "slider", min?: number, max?: number, step?: number +} & UIBase; + +declare type UISection = { + type: "section", + text: string }; +declare type UILink = { + type: "link", + link: string +} & UIBase; + +declare type ControlUI = + UIToggle + | UIDropDown + | UISlider + | UISection + | UILink + declare type Control = { name: string, position: Array, diff --git a/yarn.lock b/yarn.lock index b2b973e..7bb8fcf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -501,6 +501,10 @@ babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" +babel-plugin-syntax-class-properties@^6.8.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" + babel-plugin-syntax-exponentiation-operator@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" @@ -525,6 +529,15 @@ babel-plugin-transform-async-to-generator@^6.22.0: babel-plugin-syntax-async-functions "^6.8.0" babel-runtime "^6.22.0" +babel-plugin-transform-class-properties@^6.24.1: + version "6.24.1" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" + dependencies: + babel-helper-function-name "^6.24.1" + babel-plugin-syntax-class-properties "^6.8.0" + babel-runtime "^6.22.0" + babel-template "^6.24.1" + babel-plugin-transform-es2015-arrow-functions@^6.22.0: version "6.22.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" From a69552de7df0eb8e1b3c5c826c000732755ea4bf Mon Sep 17 00:00:00 2001 From: uwap Date: Sat, 13 Jan 2018 20:05:47 +0100 Subject: [PATCH 16/26] Fix rainbow colors --- config/utils.js | 3 +-- css/styles.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/utils.js b/config/utils.js index 60c9d5b..35503de 100644 --- a/config/utils.js +++ b/config/utils.js @@ -1,5 +1,4 @@ // @flow export const rainbow = "rgba(200,120,120,0.5);" - + "background: linear-gradient(40deg, #FF0000 0%, #00FF00 50%, #0000FF 70%, #FFFF00 100%);" - + "background-clip: text; -webkit-background-clip: text;"; + + "--before-background: linear-gradient(40deg, #FF0000 0%, #00FF00 50%, #0000FF 70%, #FFFF00 100%);"; diff --git a/css/styles.css b/css/styles.css index b6703e2..7dcb9af 100644 --- a/css/styles.css +++ b/css/styles.css @@ -23,5 +23,5 @@ body .leaflet-div-icon { .mdi:before { background-clip: text; -webkit-background-clip: text; - background: var(--before-background, transparent); + background-image: var(--before-background, transparent); } From 30e18a749f4840844db88de9b1b79e1f9dde338a Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 14 Jan 2018 00:14:50 +0100 Subject: [PATCH 17/26] Fix eslint errors --- .eslintrc.js | 1 - src/components/App.js | 3 --- src/components/UiItemList/UiItem.js | 6 ++---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 76f7bca..522ce82 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -43,7 +43,6 @@ module.exports = { "no-floating-decimal": "error", "no-implicit-coercion": "error", "no-implied-eval": "error", - "no-invalid-this": "error", "no-iterator": "error", "no-loop-func": "error", "no-multi-spaces": "warn", diff --git a/src/components/App.js b/src/components/App.js index cd1b5a0..d502a8f 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -87,9 +87,6 @@ class App extends React.Component { } changeState(topic: string, value: any) { - // this.receiveMessage(this.props.config.topics[topic].state, String(this.props.config.topics[topic].values[value] || value)); - // return; - // const rawTopic = this.props.config.topics[topic].command; if (rawTopic == null) { return; diff --git a/src/components/UiItemList/UiItem.js b/src/components/UiItemList/UiItem.js index 82112c4..b58b8ab 100644 --- a/src/components/UiItemList/UiItem.js +++ b/src/components/UiItemList/UiItem.js @@ -2,14 +2,11 @@ import React from "react"; import _ from "lodash"; import { - ListItem, - ListItemIcon, ListItemSecondaryAction, ListItemText, ListSubheader } from "material-ui/List"; import Switch from "material-ui/Switch"; -import { renderIcon } from "utils/parseIconName"; import Input, { InputLabel } from "material-ui/Input"; import { FormControl } from "material-ui/Form"; import Select from "material-ui/Select"; @@ -36,7 +33,7 @@ export default class UiItem extends React.Component> { changeState(next: any) { if (this.props.item.topic == null) { throw new Error( - `Undefined topic in ${control.type} "${control.text}"` + `Undefined topic in ${this.props.item.type} "${this.props.item.text}"` ); } this.props.onChangeState(this.props.item.topic, next); @@ -46,6 +43,7 @@ export default class UiItem extends React.Component> { const topic: string = this.props.item.topic || ""; const value = this.props.state[topic]; if (value == null) { + const control = this.props.item; throw new Error( `Unknown topic "${control.topic}" in ${control.type} "${control.text}"` ); From 832ed3d1bfbc85dff2a5367966d5fb57ffbe763d Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 14 Jan 2018 00:44:50 +0100 Subject: [PATCH 18/26] Update dependencies --- package.json | 2 +- types/types.js | 2 +- yarn.lock | 1376 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 952 insertions(+), 428 deletions(-) diff --git a/package.json b/package.json index 96e9a85..24c4b49 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "babel-preset-env": "^1.6.0", "leaflet": "^1.2.0", "lodash": "^4.17.4", - "material-ui": "next", + "material-ui": "npm:material-ui@next", "material-ui-old": "npm:material-ui@latest", "mdi": "^2.0.46", "mqtt": "^2.14.0", diff --git a/types/types.js b/types/types.js index 6e0e95c..f08b1aa 100644 --- a/types/types.js +++ b/types/types.js @@ -15,7 +15,7 @@ declare type Topics = Map; declare type UIBase = { text: string, - topic: string, + topic?: string, icon?: string, enableCondition?: (internal: string, actual: any, state: State) => boolean } diff --git a/yarn.lock b/yarn.lock index 7bb8fcf..6708b53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,53 +2,53 @@ # yarn lockfile v1 -"@babel/code-frame@7.0.0-beta.32", "@babel/code-frame@^7.0.0-beta.31": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.32.tgz#04f231b8ec70370df830d9926ce0f5add074ec4c" +"@babel/code-frame@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4" dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/helper-function-name@7.0.0-beta.32": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz#6161af4419f1b4e3ed2d28c0c79c160e218be1f3" +"@babel/helper-function-name@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d" dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.32" - "@babel/template" "7.0.0-beta.32" - "@babel/types" "7.0.0-beta.32" + "@babel/helper-get-function-arity" "7.0.0-beta.36" + "@babel/template" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" -"@babel/helper-get-function-arity@7.0.0-beta.32": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz#93721a99db3757de575a83bab7c453299abca568" +"@babel/helper-get-function-arity@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8" dependencies: - "@babel/types" "7.0.0-beta.32" + "@babel/types" "7.0.0-beta.36" -"@babel/template@7.0.0-beta.32": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.32.tgz#e1d9fdbd2a7bcf128f2f920744a67dab18072495" +"@babel/template@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00" dependencies: - "@babel/code-frame" "7.0.0-beta.32" - "@babel/types" "7.0.0-beta.32" - babylon "7.0.0-beta.32" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" lodash "^4.2.0" -"@babel/traverse@^7.0.0-beta.31": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.32.tgz#b78b754c6e1af3360626183738e4c7a05951bc99" +"@babel/traverse@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261" dependencies: - "@babel/code-frame" "7.0.0-beta.32" - "@babel/helper-function-name" "7.0.0-beta.32" - "@babel/types" "7.0.0-beta.32" - babylon "7.0.0-beta.32" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/helper-function-name" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" debug "^3.0.1" - globals "^10.0.0" + globals "^11.1.0" invariant "^2.2.0" lodash "^4.2.0" -"@babel/types@7.0.0-beta.32", "@babel/types@^7.0.0-beta.31": - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.32.tgz#c317d0ecc89297b80bbcb2f50608e31f6452a5ff" +"@babel/types@7.0.0-beta.36": + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23" dependencies: esutils "^2.0.2" lodash "^4.2.0" @@ -86,8 +86,8 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.0, acorn@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" + version "5.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822" ajv-keywords@^2.0.0, ajv-keywords@^2.1.0: version "2.1.1" @@ -101,8 +101,8 @@ ajv@^4.9.1: json-stable-stringify "^1.0.1" ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.3, ajv@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda" + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" @@ -154,6 +154,13 @@ anymatch@^1.3.0: micromatch "^2.1.5" normalize-path "^2.0.0" +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -177,10 +184,18 @@ arr-diff@^2.0.0: dependencies: arr-flatten "^1.0.1" -arr-flatten@^1.0.1: +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-flatten@^1.0.1, arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" @@ -214,6 +229,10 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -248,6 +267,10 @@ assert@^1.1.1: dependencies: util "0.10.3" +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" @@ -270,6 +293,10 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" +atob@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" + autoprefixer@^6.3.1: version "6.7.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" @@ -314,7 +341,7 @@ babel-cli@^6.24.1: optionalDependencies: chokidar "^1.6.1" -babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" dependencies: @@ -347,13 +374,15 @@ babel-core@^6.25.0, babel-core@^6.26.0: source-map "^0.5.6" babel-eslint@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.2.tgz#e44fb9a037d749486071d52d65312f5c20aa7530" + version "8.2.1" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951" dependencies: - "@babel/code-frame" "^7.0.0-beta.31" - "@babel/traverse" "^7.0.0-beta.31" - "@babel/types" "^7.0.0-beta.31" - babylon "^7.0.0-beta.31" + "@babel/code-frame" "7.0.0-beta.36" + "@babel/traverse" "7.0.0-beta.36" + "@babel/types" "7.0.0-beta.36" + babylon "7.0.0-beta.36" + eslint-scope "~3.7.1" + eslint-visitor-keys "^1.0.0" babel-generator@^6.26.0: version "6.26.0" @@ -874,9 +903,9 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" -babylon@7.0.0-beta.32, babylon@^7.0.0-beta.31: - version "7.0.0-beta.32" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e" +babylon@7.0.0-beta.36: + version "7.0.0-beta.36" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e" babylon@^6.18.0: version "6.18.0" @@ -894,6 +923,18 @@ base64-js@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886" +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + batch@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" @@ -909,8 +950,8 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" binary-extensions@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" "binary@>= 0.3.0 < 1": version "0.3.0" @@ -988,8 +1029,8 @@ boom@5.x.x: hoek "4.x.x" bowser@^1.7.3: - version "1.8.1" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.8.1.tgz#49785777e7302febadb1a5b71d9a646520ed310d" + version "1.9.1" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.1.tgz#f86ef2132e8cb10b3eb6ea5af018758c587020db" brace-expansion@^1.1.7: version "1.1.8" @@ -1006,6 +1047,22 @@ braces@^1.8.2: preserve "^0.2.0" repeat-element "^1.1.2" +braces@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.0.tgz#a46941cb5fb492156b3d6a656e06c35364e3e66e" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + brcast@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/brcast/-/brcast-3.0.1.tgz#6256a8349b20de9eed44257a9b24d71493cd48dd" @@ -1060,11 +1117,11 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" +browserify-zlib@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" dependencies: - pako "~0.2.0" + pako "~1.0.5" browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" @@ -1074,11 +1131,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2: - version "2.9.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.0.tgz#706aca15c53be15610f466e348cbfa0c00a6a379" + version "2.11.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb" dependencies: - caniuse-lite "^1.0.30000760" - electron-to-chromium "^1.3.27" + caniuse-lite "^1.0.30000789" + electron-to-chromium "^1.3.30" buffer-indexof@^1.0.0: version "1.1.1" @@ -1112,6 +1169,20 @@ bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + callback-stream@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/callback-stream/-/callback-stream-1.1.0.tgz#4701a51266f06e06eaa71fc17233822d875f4908" @@ -1169,12 +1240,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000760.tgz#3ea29473eb78a6ccb09f2eb73ac9e1debfec528d" + version "1.0.30000791" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9" -caniuse-lite@^1.0.30000760: - version "1.0.30000760" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000760.tgz#ec720395742f1c7ec8947fd6dd2604e77a8f98ff" +caniuse-lite@^1.0.30000789: + version "1.0.30000791" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16" caseless@~0.12.0: version "0.12.0" @@ -1219,11 +1290,15 @@ change-emitter@^0.1.2: version "0.1.6" resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" +chardet@^0.4.0: + version "0.4.2" + resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" + charenc@~0.0.1: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" -chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0: +chokidar@^1.6.1, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -1238,9 +1313,26 @@ chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0: optionalDependencies: fsevents "^1.0.0" +chokidar@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.0.tgz#6686313c541d3274b2a5c01233342037948c911b" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + optionalDependencies: + fsevents "^1.0.0" + ci-info@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a" + version "1.1.2" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -1259,6 +1351,15 @@ clap@^1.0.9: dependencies: chalk "^1.1.3" +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + classnames@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" @@ -1319,6 +1420,13 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + color-convert@^1.3.0, color-convert@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" @@ -1361,9 +1469,13 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.11.x, commander@^2.11.0, commander@~2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" +commander@2.12.x: + version "2.12.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555" + +commander@^2.11.0, commander@~2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" commist@^1.0.0: version "1.0.0" @@ -1376,6 +1488,10 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + compressible@~2.0.11: version "2.0.12" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66" @@ -1433,8 +1549,8 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" convert-source-map@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" cookie-signature@1.0.6: version "1.0.6" @@ -1444,13 +1560,17 @@ cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.4.0, core-js@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" + version "2.5.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1534,21 +1654,21 @@ css-in-js-utils@^2.0.0: hyphenate-style-name "^1.0.2" css-loader@^0.28.7: - version "0.28.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b" + version "0.28.8" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5" dependencies: - babel-code-frame "^6.11.0" + babel-code-frame "^6.26.0" css-selector-tokenizer "^0.7.0" - cssnano ">=2.6.1 <4" + cssnano "^3.10.0" icss-utils "^2.1.0" loader-utils "^1.0.2" lodash.camelcase "^4.3.0" - object-assign "^4.0.1" + object-assign "^4.1.1" postcss "^5.0.6" - postcss-modules-extract-imports "^1.0.0" - postcss-modules-local-by-default "^1.0.1" - postcss-modules-scope "^1.0.0" - postcss-modules-values "^1.1.0" + postcss-modules-extract-imports "^1.1.0" + postcss-modules-local-by-default "^1.2.0" + postcss-modules-scope "^1.1.0" + postcss-modules-values "^1.3.0" postcss-value-parser "^3.3.0" source-list-map "^2.0.0" @@ -1583,7 +1703,7 @@ cssesc@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" -"cssnano@>=2.6.1 <4": +cssnano@^3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" dependencies: @@ -1649,7 +1769,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2.6.9, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -1665,6 +1785,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + decompress-response@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -1694,6 +1818,18 @@ define-properties@^1.1.2: foreach "^2.0.5" object-keys "^1.0.8" +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -1729,10 +1865,14 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -depd@1.1.1, depd@~1.1.1: +depd@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" +depd@~1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -1751,8 +1891,8 @@ detect-indent@^4.0.0: repeating "^2.0.0" detect-libc@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.2.tgz#71ad5d204bf17a6a6ca8f450c61454066ef461e1" + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" detect-node@^2.0.3: version "2.0.3" @@ -1771,8 +1911,8 @@ dns-equal@^1.0.0: resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" dns-packet@^1.0.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a" + version "1.3.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" dependencies: ip "^1.1.0" safe-buffer "^5.0.1" @@ -1783,12 +1923,11 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -doctrine@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63" +doctrine@^2.0.0, doctrine@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" dependencies: esutils "^2.0.2" - isarray "^1.0.0" dom-converter@~0.1: version "0.1.4" @@ -1797,8 +1936,8 @@ dom-converter@~0.1: utila "~0.3" dom-helpers@^3.2.0, dom-helpers@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a" + version "3.3.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" dom-serializer@0: version "0.1.0" @@ -1846,9 +1985,9 @@ duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" -duplexify@^3.1.2, duplexify@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd" +duplexify@^3.5.1, duplexify@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e" dependencies: end-of-stream "^1.0.0" inherits "^2.0.1" @@ -1865,9 +2004,15 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27: - version "1.3.27" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" +electron-releases@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" + +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: + version "1.3.30" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" + dependencies: + electron-releases "^2.1.0" elliptic@^6.0.0: version "6.4.0" @@ -1896,8 +2041,8 @@ encoding@^0.1.11: iconv-lite "~0.4.13" end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206" + version "1.4.1" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" dependencies: once "^1.4.0" @@ -1915,10 +2060,10 @@ entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" errno@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d" + version "0.1.6" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026" dependencies: - prr "~0.0.0" + prr "~1.0.1" error-ex@^1.2.0: version "1.3.1" @@ -1927,8 +2072,8 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es-abstract@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" + version "1.10.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -1945,8 +2090,8 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.35" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f" + version "0.10.37" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" dependencies: es6-iterator "~2.0.1" es6-symbol "~3.1.1" @@ -2014,47 +2159,51 @@ escope@^3.6.0: estraverse "^4.1.1" eslint-plugin-flowtype@^2.39.1: - version "2.39.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.39.1.tgz#b5624622a0388bcd969f4351131232dcb9649cd5" + version "2.41.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.41.0.tgz#fd5221c60ba917c059d7ef69686a99cca09fd871" dependencies: lodash "^4.15.0" eslint-plugin-react@^7.4.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a" + version "7.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.5.1.tgz#52e56e8d80c810de158859ef07b880d2f56ee30b" dependencies: doctrine "^2.0.0" has "^1.0.1" jsx-ast-utils "^2.0.0" - prop-types "^15.5.10" + prop-types "^15.6.0" -eslint-scope@^3.7.1: +eslint-scope@^3.7.1, eslint-scope@~3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-visitor-keys@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" + eslint@^4.10.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.11.0.tgz#39a8c82bc0a3783adf5a39fa27fdd9d36fac9a34" + version "4.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.15.0.tgz#89ab38c12713eec3d13afac14e4a89e75ef08145" dependencies: ajv "^5.3.0" babel-code-frame "^6.22.0" chalk "^2.1.0" concat-stream "^1.6.0" cross-spawn "^5.1.0" - debug "^3.0.1" - doctrine "^2.0.0" + debug "^3.1.0" + doctrine "^2.0.2" eslint-scope "^3.7.1" + eslint-visitor-keys "^1.0.0" espree "^3.5.2" esquery "^1.0.0" - estraverse "^4.2.0" esutils "^2.0.2" file-entry-cache "^2.0.0" functional-red-black-tree "^1.0.1" glob "^7.1.2" - globals "^9.17.0" + globals "^11.0.1" ignore "^3.3.3" imurmurhash "^0.1.4" inquirer "^3.0.6" @@ -2105,7 +2254,7 @@ esrecurse@^4.1.0: estraverse "^4.1.0" object-assign "^4.0.1" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -2163,13 +2312,25 @@ expand-brackets@^0.1.4: dependencies: is-posix-bracket "^0.1.0" +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + expand-range@^1.8.1: version "1.8.2" resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" dependencies: fill-range "^2.1.0" -express@^4.13.3: +express@^4.16.2: version "4.16.2" resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" dependencies: @@ -2210,16 +2371,23 @@ extend-shallow@^2.0.1: dependencies: is-extendable "^0.1.0" +extend-shallow@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" external-editor@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.5.tgz#52c249a3981b9ba187c7cacf5beb50bf1d91a6bc" + version "2.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" dependencies: + chardet "^0.4.0" iconv-lite "^0.4.17" - jschardet "^1.4.2" tmp "^0.0.33" extglob@^0.3.1: @@ -2228,6 +2396,19 @@ extglob@^0.3.1: dependencies: is-extglob "^1.0.0" +extglob@^2.0.2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + extract-text-webpack-plugin@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7" @@ -2237,10 +2418,14 @@ extract-text-webpack-plugin@^3.0.2: schema-utils "^0.3.0" webpack-sources "^1.0.1" -extsprintf@1.3.0, extsprintf@^1.2.0: +extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + fast-deep-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" @@ -2295,8 +2480,8 @@ file-entry-cache@^2.0.0: object-assign "^4.0.1" file-loader@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.5.tgz#91c25b6b6fbe56dae99f10a425fd64933b5c9daa" + version "1.1.6" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8" dependencies: loader-utils "^1.0.2" schema-utils "^0.3.0" @@ -2315,6 +2500,15 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + finalhandler@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" @@ -2390,7 +2584,7 @@ flow@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/flow/-/flow-0.2.3.tgz#f8da65efa249127ec99376a28896572a9795d1af" -for-in@^1.0.1: +for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2428,13 +2622,19 @@ forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" + fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" fs-extra@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" @@ -2514,6 +2714,10 @@ get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -2579,11 +2783,11 @@ global@~4.3.0: min-document "^2.19.0" process "~0.5.1" -globals@^10.0.0: - version "10.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-10.3.0.tgz#716aba93657b56630b5a0e77de5ea8ac6215afaa" +globals@^11.0.1, globals@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4" -globals@^9.17.0, globals@^9.18.0: +globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -2691,6 +2895,33 @@ has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + has@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" @@ -2764,10 +2995,6 @@ hoek@4.x.x: version "4.2.0" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" - hoist-non-react-statics@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -2801,17 +3028,17 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" html-minifier@^3.2.3: - version "3.5.6" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.6.tgz#7e4e661a09999599c7d8e8a2b8d7fb7430bb5c3e" + version "3.5.8" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.8.tgz#5ccdb1f73a0d654e6090147511f6e6b2ee312700" dependencies: camel-case "3.0.x" clean-css "4.1.x" - commander "2.11.x" + commander "2.12.x" he "1.1.x" ncname "1.0.x" param-case "2.1.x" relateurl "0.2.x" - uglify-js "3.1.x" + uglify-js "3.3.x" html-webpack-plugin@^2.30.1: version "2.30.1" @@ -2882,9 +3109,9 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" husky@^0.14.3: version "0.14.3" @@ -2920,9 +3147,9 @@ ignore@^3.3.3: version "3.3.7" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" -import-local@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8" +import-local@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" dependencies: pkg-dir "^2.0.0" resolve-cwd "^2.0.0" @@ -2961,10 +3188,10 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" ini@~1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" -inline-style-prefixer@^3.0.2: +inline-style-prefixer@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz#8551b8e5b4d573244e66a34b04f7d32076a2b534" dependencies: @@ -2997,8 +3224,8 @@ internal-ip@1.2.0: meow "^3.3.0" interpret@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" invariant@^2.2.0, invariant@^2.2.2: version "2.2.2" @@ -3022,12 +3249,24 @@ is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" -is-absolute@^0.2.5: - version "0.2.6" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" dependencies: - is-relative "^0.2.1" - is-windows "^0.2.0" + is-relative "^1.0.0" + is-windows "^1.0.1" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -3054,15 +3293,43 @@ is-callable@^1.1.1, is-callable@^1.1.3: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" is-ci@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" dependencies: ci-info "^1.0.0" +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -3077,11 +3344,17 @@ is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" -is-extglob@^2.1.0: +is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -3117,7 +3390,13 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-in-browser@^1.0.2: +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + +is-in-browser@^1.0.2, is-in-browser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" @@ -3141,6 +3420,12 @@ is-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" +is-odd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088" + dependencies: + is-number "^3.0.0" + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -3152,8 +3437,8 @@ is-path-in-cwd@^1.0.0: is-path-inside "^1.0.0" is-path-inside@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" dependencies: path-is-inside "^1.0.1" @@ -3161,7 +3446,7 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" -is-plain-object@^2.0.1: +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" dependencies: @@ -3185,17 +3470,15 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" -is-relative@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" dependencies: - is-unc-path "^0.1.1" + is-unc-path "^1.0.0" is-resolvable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62" - dependencies: - tryit "^1.0.1" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4" is-retry-allowed@^1.0.0: version "1.1.0" @@ -3219,19 +3502,19 @@ is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" -is-unc-path@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" +is-unc-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" dependencies: - unc-path-regex "^0.1.0" + unc-path-regex "^0.1.2" is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -is-windows@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" +is-windows@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" is-wsl@^1.1.0: version "1.1.0" @@ -3255,7 +3538,7 @@ isobject@^2.0.0: dependencies: isarray "1.0.0" -isobject@^3.0.1: +isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" @@ -3278,8 +3561,8 @@ isurl@^1.0.0-alpha5: is-object "^1.0.1" js-base64@^2.1.9: - version "2.3.2" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" + version "2.4.0" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -3303,10 +3586,6 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jschardet@^1.4.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678" - jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -3368,69 +3647,77 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jss-camel-case@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-5.0.0.tgz#886c1fe56a8a11577454d6a8b4133caa6c1f53a0" - -jss-compose@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jss-compose/-/jss-compose-4.0.0.tgz#f0109e8e8301a2678279301c24523dbc76115b9b" - dependencies: - warning "^3.0.0" - -jss-default-unit@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-7.0.0.tgz#176c1db91da870e3ad16301f6f4b4cfc6fe1e90a" - -jss-expand@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-4.0.1.tgz#e8c50e0ac42e7feb6dcaf01212f6607193c1ae80" - -jss-extend@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-5.0.0.tgz#08a1d4015d05dfe011e3a281457d471226865387" - dependencies: - warning "^3.0.0" - -jss-global@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-2.0.0.tgz#a162f822f17e5d760151d908bdb41d7f2824c28f" - -jss-nested@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-5.0.0.tgz#c0752f31f2d465110d7de6ac83583dbed669faa0" - dependencies: - warning "^3.0.0" - -jss-preset-default@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-3.0.0.tgz#e43ee1ac526f689baf2bfd28ae95a6fdc3a02663" - dependencies: - jss-camel-case "^5.0.0" - jss-compose "^4.0.0" - jss-default-unit "^7.0.0" - jss-expand "^4.0.0" - jss-extend "^5.0.0" - jss-global "^2.0.0" - jss-nested "^5.0.0" - jss-props-sort "^5.0.0" - jss-vendor-prefixer "^6.0.0" - -jss-props-sort@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-5.0.0.tgz#8839c88433f64e8c1dab1a7068796f19b84f9195" - -jss-vendor-prefixer@^6.0.0: +jss-camel-case@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-6.0.0.tgz#be58124f0cbed76e98cc8eb5219dbb260f057d0b" + resolved "https://registry.yarnpkg.com/jss-camel-case/-/jss-camel-case-6.0.0.tgz#7cf8453e395c31fed931d11efbc885edcd61132e" + +jss-compose@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/jss-compose/-/jss-compose-5.0.0.tgz#ce01b2e4521d65c37ea42cf49116e5f7ab596484" + dependencies: + warning "^3.0.0" + +jss-default-unit@^8.0.0, jss-default-unit@^8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6" + +jss-expand@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-5.1.0.tgz#b1ad74ec18631f34f65a2124fcfceb6400610e3d" + +jss-extend@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-6.1.0.tgz#85f3d39944018e8f44b322c14fa316068aa7bb0b" + dependencies: + warning "^3.0.0" + +jss-global@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jss-global/-/jss-global-3.0.0.tgz#e19e5c91ab2b96353c227e30aa2cbd938cdaafa2" + +jss-nested@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/jss-nested/-/jss-nested-6.0.1.tgz#ef992b79d6e8f63d939c4397b9d99b5cbbe824ca" + dependencies: + warning "^3.0.0" + +jss-preset-default@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.0.1.tgz#822cecb87c27ff91633774422f4c221d61486b65" + dependencies: + jss-camel-case "^6.0.0" + jss-compose "^5.0.0" + jss-default-unit "^8.0.0" + jss-expand "^5.0.0" + jss-extend "^6.0.1" + jss-global "^3.0.0" + jss-nested "^6.0.1" + jss-props-sort "^6.0.0" + jss-template "^1.0.0" + jss-vendor-prefixer "^7.0.0" + +jss-props-sort@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" + +jss-template@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.0.tgz#4b874608706ddceecacdb5567e254aecb6ea69b3" + dependencies: + warning "^3.0.0" + +jss-vendor-prefixer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz#0166729650015ef19d9f02437c73667231605c71" dependencies: css-vendor "^0.3.8" -jss@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/jss/-/jss-8.1.0.tgz#b32f15efcce22446dfda4c2be09a04f38431da0a" +jss@^9.3.2, jss@^9.3.3: + version "9.5.1" + resolved "https://registry.yarnpkg.com/jss/-/jss-9.5.1.tgz#c869f38cdc44a32f4425fe007ea46b8891536326" dependencies: - is-in-browser "^1.0.2" + is-in-browser "^1.1.3" + symbol-observable "^1.1.0" warning "^3.0.0" jsx-ast-utils@^2.0.0: @@ -3447,7 +3734,7 @@ killable@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b" -kind-of@^3.0.2: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: @@ -3459,10 +3746,24 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" +kind-of@^5.0.0, kind-of@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" +lazy-cache@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" + dependencies: + set-getter "^0.1.0" + lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -3564,8 +3865,8 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, l resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" loglevel@^1.4.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.5.1.tgz#189078c94ab9053ee215a0acdbf24244ea0f6502" + version "1.6.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" longest@^1.0.1: version "1.0.1" @@ -3609,10 +3910,20 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + "match-stream@>= 0.0.2 < 1": version "0.0.2" resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf" @@ -3621,11 +3932,11 @@ map-obj@^1.0.0, map-obj@^1.0.1: readable-stream "~1.0.0" "material-ui-old@npm:material-ui@latest": - version "0.19.4" - resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.19.4.tgz#ca9cdca8aa8bb594dfac5db38ec9ff045a323587" + version "0.20.0" + resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.20.0.tgz#85411bb59c916c9c7703f29dcffc44e3a67d5111" dependencies: babel-runtime "^6.23.0" - inline-style-prefixer "^3.0.2" + inline-style-prefixer "^3.0.8" keycode "^2.1.8" lodash.merge "^4.6.0" lodash.throttle "^4.1.1" @@ -3636,9 +3947,9 @@ map-obj@^1.0.0, map-obj@^1.0.1: simple-assign "^0.1.0" warning "^3.0.0" -material-ui@next: - version "1.0.0-beta.20" - resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.20.tgz#b8d9a79f88056cd1226f0b8bd36adfaf9a8d330f" +"material-ui@npm:material-ui@next": + version "1.0.0-beta.27" + resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.27.tgz#f3073b7acffebd1fc6d0339a3260d4555445daf7" dependencies: babel-runtime "^6.26.0" brcast "^3.0.1" @@ -3646,15 +3957,19 @@ material-ui@next: deepmerge "^2.0.1" dom-helpers "^3.2.1" hoist-non-react-statics "^2.3.1" - jss "^8.1.0" - jss-preset-default "^3.0.0" + jss "^9.3.3" + jss-camel-case "^6.0.0" + jss-default-unit "^8.0.2" + jss-global "^3.0.0" + jss-nested "^6.0.1" + jss-props-sort "^6.0.0" + jss-vendor-prefixer "^7.0.0" keycode "^2.1.9" - lodash "^4.17.4" + lodash "^4.2.0" normalize-scroll-left "^0.1.2" prop-types "^15.6.0" react-event-listener "^0.5.1" - react-flow-types "0.2.0-beta.3" - react-jss "^7.2.0" + react-jss "^8.1.0" react-popper "^0.7.4" react-scrollbar-size "^2.0.2" react-transition-group "^2.2.1" @@ -3682,8 +3997,8 @@ md5@^2.1.0: is-buffer "~1.1.1" mdi@^2.0.46: - version "2.0.46" - resolved "https://registry.yarnpkg.com/mdi/-/mdi-2.0.46.tgz#65e07a7c622eda06e871cd6a336c60db8393e27a" + version "2.1.19" + resolved "https://registry.yarnpkg.com/mdi/-/mdi-2.1.19.tgz#492bfc0c4fd0c510ebd55301cc76eb03a7a2f34b" media-typer@0.3.0: version "0.3.0" @@ -3743,6 +4058,24 @@ micromatch@^2.1.5, micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" +micromatch@^3.1.4: + version "3.1.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.0" + define-property "^1.0.0" + extend-shallow "^2.0.1" + extglob "^2.0.2" + fragment-cache "^0.2.1" + kind-of "^6.0.0" + nanomatch "^1.2.5" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -3751,8 +4084,8 @@ miller-rabin@^4.0.0: brorand "^1.0.1" "mime-db@>= 1.30.0 < 2": - version "1.31.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.31.0.tgz#a49cd8f3ebf3ed1a482b60561d9105ad40ca74cb" + version "1.32.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414" mime-db@~1.30.0: version "1.30.0" @@ -3764,10 +4097,14 @@ mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, dependencies: mime-db "~1.30.0" -mime@1.4.1, mime@^1.2.11, mime@^1.3.4: +mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" +mime@^1.2.11, mime@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" @@ -3804,6 +4141,13 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" +mixin-deep@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + mkdirp@0.5, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" @@ -3820,8 +4164,8 @@ mqtt-packet@^5.4.0: safe-buffer "^5.1.0" mqtt@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-2.14.0.tgz#640b712e3c3c02ebe97882b109499bffc65f97a8" + version "2.15.1" + resolved "https://registry.yarnpkg.com/mqtt/-/mqtt-2.15.1.tgz#86fc34e387495df60cd0ccb75cd97743344a4b28" dependencies: commist "^1.0.0" concat-stream "^1.6.0" @@ -3830,7 +4174,7 @@ mqtt@^2.14.0: inherits "^2.0.3" minimist "^1.2.0" mqtt-packet "^5.4.0" - pump "^1.0.2" + pump "^2.0.0" readable-stream "^2.3.3" reinterval "^1.1.0" split2 "^2.1.1" @@ -3846,8 +4190,8 @@ multicast-dns-service-types@^1.1.0: resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" multicast-dns@^6.0.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.1.1.tgz#6e7de86a570872ab17058adea7160bbeca814dde" + version "6.2.1" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.1.tgz#c5035defa9219d30640558a49298067352098060" dependencies: dns-packet "^1.0.1" thunky "^0.1.0" @@ -3857,12 +4201,28 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" + +nanomatch@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + is-odd "^1.0.0" + kind-of "^5.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" natives@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" + version "1.1.1" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574" natural-compare@^1.4.0: version "1.4.0" @@ -3896,28 +4256,28 @@ node-forge@0.6.33: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc" node-libs-browser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" + version "2.1.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" dependencies: assert "^1.1.1" - browserify-zlib "^0.1.4" + browserify-zlib "^0.2.0" buffer "^4.3.0" console-browserify "^1.1.0" constants-browserify "^1.0.0" crypto-browserify "^3.11.0" domain-browser "^1.1.1" events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" path-browserify "0.0.0" - process "^0.11.0" + process "^0.11.10" punycode "^1.2.4" querystring-es3 "^0.2.0" - readable-stream "^2.0.5" + readable-stream "^2.3.3" stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^2.0.2" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" tty-browserify "0.0.0" url "^0.11.0" util "^0.10.3" @@ -3959,7 +4319,7 @@ normalize-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" -normalize-path@^2.0.0, normalize-path@^2.0.1: +normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" dependencies: @@ -4019,10 +4379,24 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + object-keys@^1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -4030,6 +4404,12 @@ object.omit@^2.0.0: for-own "^0.1.4" is-extendable "^0.1.1" +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + dependencies: + isobject "^3.0.1" + obuf@^1.0.0, obuf@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" @@ -4085,9 +4465,9 @@ original@>=0.0.5: dependencies: url-parse "1.0.x" -os-browserify@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" +os-browserify@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" os-homedir@^1.0.0: version "1.0.2" @@ -4139,8 +4519,10 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" p-limit@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc" + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + dependencies: + p-try "^1.0.0" p-locate@^2.0.0: version "2.0.0" @@ -4153,14 +4535,18 @@ p-map@^1.1.1: resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" p-timeout@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.0.tgz#9820f99434c5817868b4f34809ee5291660d5b6c" + version "1.2.1" + resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" dependencies: p-finally "^1.0.0" -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" +p-try@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + +pako@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" param-case@2.1.x: version "2.1.1" @@ -4197,6 +4583,10 @@ parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + path-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" @@ -4292,8 +4682,8 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" popper.js@^1.12.5: - version "1.12.7" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.7.tgz#b8d225618e5d95e27ac2b591debf581857a9c16d" + version "1.12.9" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3" portfinder@^1.0.9: version "1.0.13" @@ -4303,6 +4693,10 @@ portfinder@^1.0.9: debug "^2.2.0" mkdirp "0.5.x" +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + postcss-calc@^5.2.0: version "5.3.1" resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" @@ -4425,27 +4819,27 @@ postcss-minify-selectors@^2.0.4: postcss "^5.0.14" postcss-selector-parser "^2.0.0" -postcss-modules-extract-imports@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" +postcss-modules-extract-imports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" dependencies: postcss "^6.0.1" -postcss-modules-local-by-default@^1.0.1: +postcss-modules-local-by-default@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-scope@^1.0.0: +postcss-modules-scope@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-values@^1.1.0: +postcss-modules-values@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" dependencies: @@ -4542,12 +4936,12 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 supports-color "^3.2.3" postcss@^6.0.1: - version "6.0.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885" + version "6.0.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146" dependencies: chalk "^2.3.0" source-map "^0.6.1" - supports-color "^4.4.0" + supports-color "^5.1.0" prelude-ls@~1.1.2: version "1.1.2" @@ -4576,7 +4970,7 @@ process-nextick-args@^1.0.7, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@^0.11.0: +process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -4609,9 +5003,9 @@ proxy-addr@~2.0.2: forwarded "~0.1.2" ipaddr.js "1.5.2" -prr@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" pseudomap@^1.0.2: version "1.0.2" @@ -4636,20 +5030,20 @@ public-encrypt@^4.0.0: setimmediate ">= 1.0.2 < 2" slice-stream ">= 1.0.0 < 2" -pump@^1.0.0, pump@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51" +pump@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.0.tgz#7946da1c8d622b098e2ceb2d3476582470829c9d" dependencies: end-of-stream "^1.1.0" once "^1.3.1" pumpify@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.5.tgz#1b671c619940abcaeac0ad0e3a3c164be760993b" + version "1.3.6" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.6.tgz#00d40e5ded0a3bf1e0788b1c0cf426a42882ab64" dependencies: - duplexify "^3.1.2" - inherits "^2.0.1" - pump "^1.0.0" + duplexify "^3.5.3" + inherits "^2.0.3" + pump "^2.0.0" punycode@1.3.2: version "1.3.2" @@ -4708,8 +5102,8 @@ randomatic@^1.1.3: kind-of "^4.0.0" randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" + version "2.0.6" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" dependencies: safe-buffer "^5.1.0" @@ -4734,8 +5128,8 @@ raw-body@2.3.2: unpipe "1.0.0" rc@^1.1.7: - version "1.2.2" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" + version "1.2.3" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -4743,8 +5137,8 @@ rc@^1.1.7: strip-json-comments "~2.0.1" react-dom@^16.0.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.0.tgz#ab6fd2a285096f388aeba51919a573d06c9bdde4" + version "16.2.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -4752,39 +5146,35 @@ react-dom@^16.0.0: prop-types "^15.6.0" react-event-listener@^0.5.0, react-event-listener@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.1.tgz#ba36076e47bc37c5a67ff5ccd4a9ff0f15621040" + version "0.5.3" + resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.3.tgz#a8b492596ad601865314fcc2c18cb87b6ce3876e" dependencies: babel-runtime "^6.26.0" fbjs "^0.8.16" prop-types "^15.6.0" warning "^3.0.0" -react-flow-types@0.2.0-beta.3: - version "0.2.0-beta.3" - resolved "https://registry.yarnpkg.com/react-flow-types/-/react-flow-types-0.2.0-beta.3.tgz#93e7e3c95a75a1a941de05b9d7287e3ca6871046" - -react-jss@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-7.2.0.tgz#30a5ed51d8388a33767c6d19790b222c1f33f48f" +react-jss@^8.1.0: + version "8.2.1" + resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.2.1.tgz#b2905063ba8b950f095a139a75232d851c79e15e" dependencies: - hoist-non-react-statics "^1.2.0" - jss "^8.1.0" - jss-preset-default "^3.0.0" - prop-types "^15.5.8" - theming "^1.1.0" + hoist-non-react-statics "^2.3.1" + jss "^9.3.2" + jss-preset-default "^4.0.1" + prop-types "^15.6.0" + theming "^1.3.0" react-leaflet@^1.5.0: - version "1.7.4" - resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.7.4.tgz#073202401b5804cb00e97adf0768d1b2e3b7c9e9" + version "1.7.8" + resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.7.8.tgz#5b58be948a7e2efe5c302a65746c9e8b25477c59" dependencies: lodash "^4.0.0" lodash-es "^4.0.0" warning "^3.0.0" react-popper@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.7.4.tgz#8649d539837e7c6f47bc9b24c9cf57a404e199a1" + version "0.7.5" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.7.5.tgz#71c25946f291db381231281f6b95729e8b801596" dependencies: popper.js "^1.12.5" prop-types "^15.5.10" @@ -4825,8 +5215,8 @@ react-transition-group@^2.2.1: warning "^3.0.0" react@^16.0.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.1.0.tgz#1c2bdac3c17fe7ee9282fa35aca6cc36387903e1" + version "16.2.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -4941,8 +5331,8 @@ regenerator-runtime@^0.10.5: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" regenerator-runtime@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1" + version "0.11.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" regenerator-transform@^0.10.0: version "0.10.1" @@ -4958,6 +5348,12 @@ regex-cache@^0.4.2: dependencies: is-equal-shallow "^0.1.3" +regex-not@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.0.tgz#42f83e39771622df826b02af176525d6a5f157f9" + dependencies: + extend-shallow "^2.0.1" + regexpu-core@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" @@ -5010,7 +5406,7 @@ repeat-element@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" -repeat-string@^1.5.2: +repeat-string@^1.5.2, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" @@ -5107,6 +5503,10 @@ resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -5226,10 +5626,34 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" +set-getter@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" + dependencies: + to-object-path "^0.3.0" + set-immediate-shim@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + "setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2", setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -5283,6 +5707,33 @@ slice-ansi@1.0.0: dependencies: readable-stream "~1.0.31" +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^2.0.0" + sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" @@ -5306,12 +5757,12 @@ sockjs-client@1.1.4: json3 "^3.3.2" url-parse "^1.1.8" -sockjs@0.3.18: - version "0.3.18" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207" +sockjs@0.3.19: + version "0.3.19" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d" dependencies: faye-websocket "^0.10.0" - uuid "^2.0.2" + uuid "^3.0.1" sort-keys@^1.0.0: version "1.1.2" @@ -5323,12 +5774,26 @@ source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" +source-map-resolve@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" + dependencies: + atob "^2.0.0" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: source-map "^0.5.6" +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -5374,6 +5839,12 @@ spdy@^3.4.1: select-hose "^2.0.0" spdy-transport "^2.0.18" +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + split2@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" @@ -5398,6 +5869,13 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + "statuses@>= 1.3.1 < 2": version "1.4.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" @@ -5413,7 +5891,7 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-http@^2.3.1: +stream-http@^2.7.2: version "2.7.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" dependencies: @@ -5446,16 +5924,16 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string_decoder@^0.10.25, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.3: +string_decoder@^1.0.0, string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -5501,8 +5979,8 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" style-loader@^0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759" + version "0.19.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85" dependencies: loader-utils "^1.0.2" schema-utils "^0.3.0" @@ -5517,12 +5995,18 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0: +supports-color@^4.0.0, supports-color@^4.2.1: version "4.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" dependencies: has-flag "^2.0.0" +supports-color@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5" + dependencies: + has-flag "^2.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -5535,9 +6019,9 @@ svgo@^0.7.0: sax "~1.2.1" whet.extend "~0.9.9" -symbol-observable@^1.0.3, symbol-observable@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" +symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32" table@^4.0.1: version "4.0.2" @@ -5579,9 +6063,9 @@ text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" -theming@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/theming/-/theming-1.2.1.tgz#3de0be696339c6c203013a6c68d1c1057973dc44" +theming@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/theming/-/theming-1.3.0.tgz#286d5bae80be890d0adc645e5ca0498723725bdc" dependencies: brcast "^3.0.1" is-function "^1.0.1" @@ -5618,7 +6102,7 @@ timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" -timers-browserify@^2.0.2: +timers-browserify@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" dependencies: @@ -5631,11 +6115,10 @@ tmp@^0.0.33: os-tmpdir "~1.0.2" to-absolute-glob@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz#70c375805b9e3105e899ee8dbdd6a9aa108f407b" + version "2.0.2" + resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" dependencies: - extend-shallow "^2.0.1" - is-absolute "^0.2.5" + is-absolute "^1.0.0" is-negated-glob "^1.0.0" to-arraybuffer@^1.0.0: @@ -5650,6 +6133,27 @@ to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae" + dependencies: + define-property "^0.2.5" + extend-shallow "^2.0.1" + regex-not "^1.0.0" + toposort@^1.0.0: version "1.0.6" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec" @@ -5672,10 +6176,6 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" -tryit@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" - tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -5711,11 +6211,11 @@ ua-parser-js@^0.7.9: version "0.7.17" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" -uglify-js@3.1.x: - version "3.1.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.1.9.tgz#dffca799308cf327ec3ac77eeacb8e196ce3b452" +uglify-js@3.3.x: + version "3.3.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.6.tgz#3ca624e713f1981df455d72a02ab6ffe632b5d2d" dependencies: - commander "~2.11.0" + commander "~2.13.0" source-map "~0.6.1" uglify-js@^2.8.29: @@ -5744,13 +6244,22 @@ uid-number@^0.0.6: resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" ultron@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864" + version "1.1.1" + resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" -unc-path-regex@^0.1.0: +unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -5780,6 +6289,13 @@ unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + unzip@^0.1.11: version "0.1.11" resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0" @@ -5795,6 +6311,10 @@ upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" @@ -5826,6 +6346,14 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" + dependencies: + define-property "^0.2.5" + isobject "^3.0.0" + lazy-cache "^2.0.2" + user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" @@ -5852,11 +6380,7 @@ utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" -uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - -uuid@^3.0.0, uuid@^3.1.0: +uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" @@ -5915,32 +6439,32 @@ wbuf@^1.1.0, wbuf@^1.7.2: dependencies: minimalistic-assert "^1.0.0" -webpack-dev-middleware@^1.11.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709" +webpack-dev-middleware@1.12.2: + version "1.12.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" dependencies: memory-fs "~0.4.1" - mime "^1.3.4" + mime "^1.5.0" path-is-absolute "^1.0.0" range-parser "^1.0.3" time-stamp "^2.0.0" webpack-dev-server@^2.9.4: - version "2.9.4" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#7883e61759c6a4b33e9b19ec4037bd4ab61428d1" + version "2.10.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.10.1.tgz#a9768375346e62155860fe3cef3d4d641b24273e" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" bonjour "^3.5.0" - chokidar "^1.6.0" + chokidar "^2.0.0" compression "^1.5.2" connect-history-api-fallback "^1.3.0" debug "^3.1.0" del "^3.0.0" - express "^4.13.3" + express "^4.16.2" html-entities "^1.2.0" http-proxy-middleware "~0.17.4" - import-local "^0.1.1" + import-local "^1.0.0" internal-ip "1.2.0" ip "^1.1.5" killable "^1.0.0" @@ -5949,13 +6473,13 @@ webpack-dev-server@^2.9.4: portfinder "^1.0.9" selfsigned "^1.9.1" serve-index "^1.7.2" - sockjs "0.3.18" + sockjs "0.3.19" sockjs-client "1.1.4" spdy "^3.4.1" - strip-ansi "^3.0.1" - supports-color "^4.2.1" - webpack-dev-middleware "^1.11.0" - yargs "^6.6.0" + strip-ansi "^4.0.0" + supports-color "^5.1.0" + webpack-dev-middleware "1.12.2" + yargs "6.6.0" webpack-merge@^4.1.1: version "4.1.1" @@ -5968,15 +6492,15 @@ webpack-shell-plugin@^0.5.0: resolved "https://registry.yarnpkg.com/webpack-shell-plugin/-/webpack-shell-plugin-0.5.0.tgz#29b8a1d80ddeae0ddb10e729667f728653c2c742" webpack-sources@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.2.tgz#d0148ec083b3b5ccef1035a6b3ec16442983b27a" + version "1.1.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" dependencies: source-list-map "^2.0.0" source-map "~0.6.1" webpack@^3.1.0: - version "3.8.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.8.1.tgz#b16968a81100abe61608b0153c9159ef8bb2bd83" + version "3.10.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725" dependencies: acorn "^5.0.0" acorn-dynamic-import "^2.0.0" @@ -6085,8 +6609,8 @@ write@^0.2.1: mkdirp "^0.5.1" ws@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.1.tgz#d97e34dee06a1190c61ac1e95f43cb60b78cf939" + version "3.3.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" @@ -6127,6 +6651,24 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" +yargs@6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^4.2.0" + yargs@^4.2.0: version "4.8.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" @@ -6146,24 +6688,6 @@ yargs@^4.2.0: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^4.2.0" - yargs@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" From da7105c90b2398c8d9e2dd95fc22b30d402ad468 Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 14 Jan 2018 01:20:30 +0100 Subject: [PATCH 19/26] Add basic esper status info support --- config/rzl.js | 11 ++++++----- config/utils.js | 25 +++++++++++++++++++++++++ src/components/UiItemList/UiItem.js | 9 +++++++++ src/components/UiItemList/index.js | 7 ++++++- types/types.js | 5 +++++ 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/config/rzl.js b/config/rzl.js index bfd4bbf..7179ae1 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -7,7 +7,7 @@ const config : Config = { color: "orange", mqtt: "ws://map.rzl:1884" }, - topics: { + topics: Object.assign({}, { led_stahltraeger: { state: "/service/openhab/out/pca301_ledstrips/state", command: "/service/openhab/in/pca301_ledstrips/command", @@ -116,8 +116,9 @@ const config : Config = { command: "/service/openhab/in/pca301_infoscreen/command", defaultValue: "OFF", values: { on: "ON", off: "OFF" } - } - }, + }}, + utils.esper_topics("afba40") + ), controls: { led_stahltrager: { name: "LED Stahlträger", @@ -220,14 +221,14 @@ const config : Config = { position: [450, 590], icon: "fire", iconColor: ({flyfry}) => flyfry == "on" ? "#6666FF" : "#000000", - ui: [ + ui: utils.esper_statistics("afba40", [ { type: "toggle", text: "Fliegenbratgerät", topic: "flyfry", icon: "power" } - ] + ]) }, artnet: { name: "Artnet", diff --git a/config/utils.js b/config/utils.js index 35503de..f778bb9 100644 --- a/config/utils.js +++ b/config/utils.js @@ -2,3 +2,28 @@ export const rainbow = "rgba(200,120,120,0.5);" + "--before-background: linear-gradient(40deg, #FF0000 0%, #00FF00 50%, #0000FF 70%, #FFFF00 100%);"; + +export const esper_topics = (chip_id: string) => ({ + [ `esper_${chip_id}_version` ]: { + state: `/service/esper/${chip_id}/info`, + command: "", + defaultValue: "UNKNOWN", + values: {}, + parseState: msg => JSON.parse(msg.toString()).version.esper + } +}); + +export const esper_statistics = (chip_id: string, + prev_ui: Array = []) => ( + prev_ui.concat([ + { + type: "section", + text: "Funkdose" + }, + { + type: "text", + text: "Version", + topic: `esper_${chip_id}_version` + } + ]) + ); diff --git a/src/components/UiItemList/UiItem.js b/src/components/UiItemList/UiItem.js index b58b8ab..8cb7d01 100644 --- a/src/components/UiItemList/UiItem.js +++ b/src/components/UiItemList/UiItem.js @@ -172,3 +172,12 @@ export class Section extends UiItem { ); } } + +export class Text extends UiItem { + render() { + return [ + , + + ]; + } +} diff --git a/src/components/UiItemList/index.js b/src/components/UiItemList/index.js index bba000d..d6e3d8f 100644 --- a/src/components/UiItemList/index.js +++ b/src/components/UiItemList/index.js @@ -20,7 +20,7 @@ import Button from "material-ui/Button"; import Slider from "material-ui-old/Slider"; import MuiThemeProvider from "material-ui-old/styles/MuiThemeProvider"; -import { Toggle, DropDown, Link, Section } from "./UiItem"; +import { Toggle, DropDown, Link, Section, Text } from "./UiItem"; export type UiItemListProps = { controls: Array, @@ -78,6 +78,11 @@ export default class UiItemList extends React.Component { case "slider": { return this.renderSlider(control); } + case "text": { + return ; + } default: { throw new Error( `Unknown UI type "${control.type}" for "${control.text}" component` diff --git a/types/types.js b/types/types.js index f08b1aa..caf4ea3 100644 --- a/types/types.js +++ b/types/types.js @@ -50,12 +50,17 @@ declare type UILink = { link: string } & UIBase; +declare type UIText = { + type: "text" +} & UIBase; + declare type ControlUI = UIToggle | UIDropDown | UISlider | UISection | UILink + | UIText declare type Control = { name: string, From ef41de4349db39ac71058ab3cc1c1575da884fff Mon Sep 17 00:00:00 2001 From: uwap Date: Sun, 14 Jan 2018 01:35:42 +0100 Subject: [PATCH 20/26] Correctly change to map icon when mqtt has connected successfully --- config/rzl.js | 15 +++++++-------- src/components/App.js | 11 ++++++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/config/rzl.js b/config/rzl.js index 7179ae1..642f1d9 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -7,7 +7,7 @@ const config : Config = { color: "orange", mqtt: "ws://map.rzl:1884" }, - topics: Object.assign({}, { + topics: { led_stahltraeger: { state: "/service/openhab/out/pca301_ledstrips/state", command: "/service/openhab/in/pca301_ledstrips/command", @@ -116,14 +116,13 @@ const config : Config = { command: "/service/openhab/in/pca301_infoscreen/command", defaultValue: "OFF", values: { on: "ON", off: "OFF" } - }}, - utils.esper_topics("afba40") - ), + } + }, controls: { led_stahltrager: { name: "LED Stahlträger", - position: [380, 300], - icon: "white-balance-iridescent rotate-90", + position: [380, 590], + icon: "white-balance-iridescent", iconColor: ({led_stahltraeger}) => led_stahltraeger == "on" ? utils.rainbow : "#000000", ui: [ { @@ -221,14 +220,14 @@ const config : Config = { position: [450, 590], icon: "fire", iconColor: ({flyfry}) => flyfry == "on" ? "#6666FF" : "#000000", - ui: utils.esper_statistics("afba40", [ + ui: [ { type: "toggle", text: "Fliegenbratgerät", topic: "flyfry", icon: "power" } - ]) + ] }, artnet: { name: "Artnet", diff --git a/src/components/App.js b/src/components/App.js index d502a8f..671fb62 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -25,7 +25,8 @@ export type AppState = { selectedControl: ?Control, drawerOpened: boolean, mqttState: State, - mqttSend: (topic: string, value: any) => void + mqttSend: (topic: string, value: any) => void, + mqttConnected: boolean, }; class App extends React.Component { @@ -40,8 +41,12 @@ class App extends React.Component { })), mqttSend: connectMqtt(props.config.space.mqtt, { onMessage: this.receiveMessage.bind(this), + onConnect: () => this.setState({ mqttConnected: true }), + onReconnect: () => this.setState({ mqttConnected: false }), + onDisconnect: () => this.setState({ mqttConnected: false }), subscribe: _.map(props.config.topics, (x) => x.state) - }) + }), + mqttConnected: false }; } @@ -103,7 +108,7 @@ class App extends React.Component {
+ connected={this.state.mqttConnected} /> Date: Sun, 14 Jan 2018 13:54:24 +0100 Subject: [PATCH 21/26] RZL: Add onkyo radio Beat Blender (Soma FM) --- config/rzl.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/rzl.js b/config/rzl.js index 642f1d9..a8a38c0 100644 --- a/config/rzl.js +++ b/config/rzl.js @@ -97,7 +97,8 @@ const config : Config = { command: "/service/onkyo/command", defaultValue: "", values: { mpd: "NPR01", kohina: "NPR02", somafm_dronezone: "NPR03", somafm_thetrip: "NPR04", - querfunk: "NPR05", somafm_defconradio: "NPR06", somafm_secretagent: "NPR07", somafm_lush: "NPR08"} + querfunk: "NPR05", somafm_defconradio: "NPR06", somafm_secretagent: "NPR07", somafm_lush: "NPR08", + somafm_beatblender: "NPR09"} }, rundumleuchte: { state: "/service/openhab/out/pca301_rundumleuchte/state", @@ -330,7 +331,8 @@ const config : Config = { querfunk: "Querfunk", somafm_defconradio: "Defcon Radio (SomaFM)", somafm_secretagent: "Secret Agent (SomaFM)", - somafm_lush: "Lush (SomaFM)" + somafm_lush: "Lush (SomaFM)", + somafm_beatblender: "Beat Blender (Soma FM)" }, icon: "radio", enableCondition: (a, b, state) => state.onkyo_connection.internal == "connected" && state.onkyo_inputs.internal == "netzwerk" From c1ed43ee6c2f1254d436e607b4bbb0478e2e5d1c Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 19 Jan 2018 16:20:10 +0100 Subject: [PATCH 22/26] Cleanup flow types and fix eslint errors --- src/components/ControlMap.js | 10 +-- src/components/UiItemList/UiItem.js | 67 +++++++++++----- src/components/UiItemList/index.js | 114 ++++------------------------ types/types.js | 74 ++++++++++++------ 4 files changed, 118 insertions(+), 147 deletions(-) diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index 81dafcd..7c08afe 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -7,7 +7,7 @@ import parseIconName, { controlGetIcon } from "utils/parseIconName"; export type Point = [number, number]; -const convertPoint = ([y,x]: Point): Point => [-x, y]; +const convertPoint = ([y, x]: Point): Point => [-x, y]; export type ControlMapProps = { width: number, @@ -58,12 +58,10 @@ export default class ControlMap extends React.Component { } iconColor(control: Control): string { + const ints = _.mapValues(this.props.state, (x) => x.internal || x.actual); + const acts = _.mapValues(this.props.state, (x) => x.actual); if (control.iconColor != null) { - return control.iconColor( - _.mapValues(this.props.state, (x) => x.internal || x.actual), - _.mapValues(this.props.state, (x) => x.actual), - this.props.state - ); + return control.iconColor(ints, acts, this.props.state); } return "#000"; } diff --git a/src/components/UiItemList/UiItem.js b/src/components/UiItemList/UiItem.js index 8cb7d01..983495d 100644 --- a/src/components/UiItemList/UiItem.js +++ b/src/components/UiItemList/UiItem.js @@ -21,7 +21,7 @@ type UiItemProps = { onChangeState: (topic: string, nextState: any) => void }; -export default class UiItem extends React.Component> { +export default class UiItem extends React.Component> { constructor(props: UiItemProps) { super(props); } @@ -30,48 +30,79 @@ export default class UiItem extends React.Component> { } + render() { + return null; + } + + /* + * TODO: The type system can't really check if the enableCondition is of + * any function type or if it is a TopicDependentOption or a + * StateDependentOption. This should be fixed. + */ + isEnabled() { + if (Object.keys(this.props.item).includes("enableCondition") && + typeof this.props.item.enableCondition == "function") { + const enableCondition = this.props.item.enableCondition; + const state = this.props.state; + const internals = _.mapValues(state, (x) => x.internal); + const actuals = _.mapValues(state, (x) => x.actual); + return enableCondition(internals, actuals, state); + } else { + return true; + } + } +} + +export class UiControl extends UiItem { + constructor(props: UiItemProps) { + super(props); + } + changeState(next: any) { if (this.props.item.topic == null) { throw new Error( - `Undefined topic in ${this.props.item.type} "${this.props.item.text}"` + `Missing topic in ${this.props.item.type} "${this.props.item.text}"` ); } this.props.onChangeState(this.props.item.topic, next); } getValue() { - const topic: string = this.props.item.topic || ""; + const control = this.props.item; + const topic: string = control.topic || ""; const value = this.props.state[topic]; if (value == null) { - const control = this.props.item; + if (topic === "") { + throw new Error( + `Missing topic in ${control.type} "${control.text}"` + ); + } throw new Error( - `Unknown topic "${control.topic}" in ${control.type} "${control.text}"` + `Unknown topic "${topic}" in ${control.type} "${control.text}"` ); } return value; } isEnabled() { - const enableCondition = this.props.item.enableCondition; - if (enableCondition == null) { - return true; - } else { + if (Object.keys(this.props.item).includes("enableCondition") && + typeof this.props.item.enableCondition == "function") { + const enableCondition = this.props.item.enableCondition; const value = this.getValue(); return enableCondition( value.internal || value.actual, value.actual, this.props.state); + } else { + return true; } } - - render() { - return null; - } } -export class Toggle extends UiItem { +export class Toggle extends UiControl { isToggled = () => { const value = this.getValue(); const control = this.props.item; - const isChecked = control.toggled || ((i) => i === (control.on || "on")); + const isChecked = control.toggled || + ((i, _a, _s) => i === (control.on || "on")); const checked = isChecked( value.internal || value.actual, value.actual, this.props.state); return checked; @@ -99,7 +130,7 @@ export class Toggle extends UiItem { } } -export class DropDown extends UiItem { +export class DropDown extends UiControl { runPrimaryAction = (next?: any) => { if (this.isEnabled()) { const control = this.props.item; @@ -117,7 +148,7 @@ export class DropDown extends UiItem { render() { const control = this.props.item; const value = this.getValue(); - const id = `${control.topic}-${control.name}`; + const id = `${control.topic}-${control.text}`; const options = control.options; if (options == null) { throw new Error( @@ -173,7 +204,7 @@ export class Section extends UiItem { } } -export class Text extends UiItem { +export class Text extends UiControl { render() { return [ , diff --git a/src/components/UiItemList/index.js b/src/components/UiItemList/index.js index d6e3d8f..f089113 100644 --- a/src/components/UiItemList/index.js +++ b/src/components/UiItemList/index.js @@ -5,16 +5,9 @@ import { ListItem, ListItemIcon, ListItemSecondaryAction, - ListItemText, - ListSubheader + ListItemText } from "material-ui/List"; -import Switch from "material-ui/Switch"; import { renderIcon } from "utils/parseIconName"; -import Input, { InputLabel } from "material-ui/Input"; -import { FormControl } from "material-ui/Form"; -import Select from "material-ui/Select"; -import { MenuItem } from "material-ui/Menu"; -import Button from "material-ui/Button"; // TODO: Use something else import Slider from "material-ui-old/Slider"; @@ -57,31 +50,31 @@ export default class UiItemList extends React.Component { switch (control.type) { case "toggle": { return ; + state={this.props.state} + onChangeState={this.props.onChangeState} />; } case "dropDown": { return ; + state={this.props.state} + onChangeState={this.props.onChangeState} />; } case "section": { return
; + state={this.props.state} + onChangeState={this.props.onChangeState} />; } case "link": { return ; + state={this.props.state} + onChangeState={this.props.onChangeState} />; } case "slider": { return this.renderSlider(control); } case "text": { return ; + state={this.props.state} + onChangeState={this.props.onChangeState} />; } default: { throw new Error( @@ -91,18 +84,7 @@ export default class UiItemList extends React.Component { } } - isEnabled(control: ControlUI) { - const enableCondition = control.enableCondition; - if (enableCondition == null) { - return true; - } else { - const value = this.getValue(control); - return enableCondition( - value.internal || value.actual, value.actual, this.props.state); - } - } - - getValue(control: ControlUI) { + getValue(control: UIControl) { const value = this.props.state[control.topic]; if (value == null) { throw new Error( @@ -112,77 +94,7 @@ export default class UiItemList extends React.Component { return value; } - toggleSwitch(control: ControlUI, newState: boolean) { - this.props.onChangeState(control.topic, - newState ? (control.on || "on") : (control.off || "off")); - } - - renderToggle(control: ControlUI) { - const value = this.getValue(control); - const isToggled = control.toggled || ((i) => i === (control.on || "on")); - const checked = isToggled( - value.internal || value.actual, value.actual, this.props.state); - return [ - , - - this.toggleSwitch(control, state)} - disabled={!this.isEnabled(control)} /> - - ]; - } - - changeDropDown(control: ControlUI, newState: string) { - this.props.onChangeState(control.topic, newState); - } - - renderDropDown(control: ControlUI) { - const value = this.getValue(control); - const id = `${control.topic}-${control.name}`; - const options = control.options; - if (options == null) { - throw new Error( - `Parameter "options" missing for ${control.type} "${control.text}"` - ); - } - return ( - - {control.text} - } - > - {_.map(options, (v, k) => {v})} - - - ); - } - - renderSection(control: ControlUI) { - return ( - {control.text} - ); - } - - renderLink(control: ControlUI) { - if (control.link == null) { - throw new Error( - `Parameter "link" missing for ${control.type} "${control.text}"` - ); - } - return ( - - ); - } - - renderSlider(control: ControlUI) { + renderSlider(control: UISlider) { const value = this.getValue(control); return [ , diff --git a/types/types.js b/types/types.js index caf4ea3..d9b7785 100644 --- a/types/types.js +++ b/types/types.js @@ -13,46 +13,76 @@ declare type Topic = { }; declare type Topics = Map; -declare type UIBase = { - text: string, - topic?: string, - icon?: string, - enableCondition?: (internal: string, actual: any, state: State) => boolean -} +declare type TopicDependentOption = ( + internal: string, actual: any, state: State + ) => T; +declare type StateDependentOption = ( + internals: Map, actuals: Map, state: State + ) => T; -declare type UIToggle = { +interface UIControl { + +type: string, + +text: string, + +topic: string +}; + +interface Enableable { + enableCondition?: TopicDependentOption +}; + +declare type UIToggle = $ReadOnly<{| type: "toggle", + text: string, + topic: string, + icon?: string, + enableCondition?: TopicDependentOption, on?: string, off?: string, - toggled?: (internal: string, actual: any, state: State) => boolean, -} & UIBase; + toggled?: TopicDependentOption +|}>; -declare type UIDropDown = { +declare type UIDropDown = $ReadOnly<{| type: "dropDown", + text: string, + topic: string, + icon?: string, + enableCondition?: TopicDependentOption, options: Map, renderValue?: (value: string) => string -} & UIBase; +|}>; -declare type UISlider = { +declare type UISlider = $ReadOnly<{| type: "slider", + text: string, + topic: string, + icon?: string, + enableCondition?: TopicDependentOption, min?: number, max?: number, step?: number -} & UIBase; +|}>; -declare type UISection = { +declare type UISection = $ReadOnly<{| type: "section", text: string -}; +|}>; -declare type UILink = { +declare type UILink = $ReadOnly<{| type: "link", - link: string -} & UIBase; + text: string, + link: string, + enableCondition?: StateDependentOption, + + // TODO: check if both the following options are implemented + icon?: string +|}>; -declare type UIText = { - type: "text" -} & UIBase; +declare type UIText = $ReadOnly<{| + type: "text", + text: string, + topic: string, + icon?: string +|}>; declare type ControlUI = UIToggle @@ -64,7 +94,7 @@ declare type ControlUI = declare type Control = { name: string, - position: Array, + position: [number, number], icon: string | ( internals: Map, actuals: Map, From cfe8897f2a34fc079cec3794bacbb0aea3ad6943 Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 19 Jan 2018 16:53:16 +0100 Subject: [PATCH 23/26] Fix all type errors --- src/components/ControlMap.js | 11 +++++++++-- src/components/SideBar.js | 5 +++-- webpack.common.js | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/ControlMap.js b/src/components/ControlMap.js index 7c08afe..5d4b1a1 100644 --- a/src/components/ControlMap.js +++ b/src/components/ControlMap.js @@ -92,9 +92,16 @@ export default class ControlMap extends React.Component { + checked={layer.defaultVisibility === "visible"} + removeLayer={(_layer) => {}} + removeLayerControl={(_layer) => {}} + addOverlay={(_layer, _name, _checked) => {}} + addBaseLayer={(_layer, _name, _checked) => {}}> ); diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 1aadfa6..164f8fc 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -1,5 +1,5 @@ // @flow -import React from "react"; +import * as React from "react"; import withStyles from "material-ui/styles/withStyles"; import Drawer from "material-ui/Drawer"; @@ -14,7 +14,8 @@ export type SideBarProps = { control: ?Control, open: boolean, onCloseRequest: () => void, - icon?: ?string + icon?: ?string, + children?: React.Node }; export type SideBarState = { diff --git a/webpack.common.js b/webpack.common.js index 31d08f1..d5457c6 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -25,7 +25,7 @@ module.exports = { }, plugins: [ new CleanWebpackPlugin(["dist"]), - // new WebpackShellPlugin({onBuildStart:preBuildScripts}), + new WebpackShellPlugin({onBuildStart:preBuildScripts}), new HtmlWebpackPlugin({ title: 'Space Map', template: 'index.ejs' From 4b8b18515e175a10d07fa72d525b72622dcd656b Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 19 Jan 2018 16:58:02 +0100 Subject: [PATCH 24/26] fix flowconfig --- .flowconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/.flowconfig b/.flowconfig index 83cd117..de8b8f6 100644 --- a/.flowconfig +++ b/.flowconfig @@ -11,6 +11,3 @@ esproposal.export_star_as=enable unsafe.enable_getters_and_setters=true module.system.node.resolve_dirname=node_modules module.system.node.resolve_dirname=src - -[lints] -all=warn From 41cf23041df7b30e996919d4c9dfc1cd9a8b9a43 Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 19 Jan 2018 17:07:31 +0100 Subject: [PATCH 25/26] Upgrade all dependencies --- package.json | 10 ++-- yarn.lock | 158 +++++++++++++++++++++++++++------------------------ 2 files changed, 89 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index 24c4b49..bcf96bb 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "babel-preset-env": "^1.6.0", - "leaflet": "^1.2.0", + "leaflet": "^1.3.1", "lodash": "^4.17.4", "material-ui": "npm:material-ui@next", "material-ui-old": "npm:material-ui@latest", @@ -21,7 +21,7 @@ "mqtt": "^2.14.0", "react": "^16.0.0", "react-dom": "^16.0.0", - "react-leaflet": "^1.5.0", + "react-leaflet": "^1.8.0", "react-tap-event-plugin": "^3.0.0", "redux": "^3.7.2" }, @@ -33,20 +33,20 @@ "babel-plugin-transform-class-properties": "^6.24.1", "babel-preset-react": "^6.24.1", "clean-webpack-plugin": "^0.1.17", - "css-loader": "^0.28.7", + "css-loader": "^0.28.9", "eslint": "^4.10.0", "eslint-plugin-flowtype": "^2.39.1", "eslint-plugin-react": "^7.4.0", "extract-text-webpack-plugin": "^3.0.2", "file-loader": "^1.1.5", "flow": "^0.2.3", - "flow-bin": "^0.50.0", + "flow-bin": "^0.63.1", "flow-typed": "^2.2.1", "html-webpack-plugin": "^2.30.1", "husky": "^0.14.3", "style-loader": "^0.19.0", "webpack": "^3.1.0", - "webpack-dev-server": "^2.9.4", + "webpack-dev-server": "^2.11.0", "webpack-merge": "^4.1.1", "webpack-shell-plugin": "^0.5.0" }, diff --git a/yarn.lock b/yarn.lock index 6708b53..a7558e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -54,6 +54,20 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" +"@types/jss@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.3.0.tgz#0f8484fd03ded206917be27b58217f274a0ad59f" + +"@types/react-transition-group@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.6.tgz#8903fa2cf540ba454461590bff811a787889617c" + dependencies: + "@types/react" "*" + +"@types/react@*": + version "16.0.34" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.34.tgz#7a8f795afd8a404a9c4af9539b24c75d3996914e" + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1131,10 +1145,10 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: electron-to-chromium "^1.2.7" browserslist@^2.1.2: - version "2.11.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb" + version "2.11.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" dependencies: - caniuse-lite "^1.0.30000789" + caniuse-lite "^1.0.30000792" electron-to-chromium "^1.3.30" buffer-indexof@^1.0.0: @@ -1240,12 +1254,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000791" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9" + version "1.0.30000793" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000793.tgz#3c00c66e423a7a1907c7dd96769a78b2afa8a72e" -caniuse-lite@^1.0.30000789: - version "1.0.30000791" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16" +caniuse-lite@^1.0.30000792: + version "1.0.30000792" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332" caseless@~0.12.0: version "0.12.0" @@ -1653,9 +1667,9 @@ css-in-js-utils@^2.0.0: dependencies: hyphenate-style-name "^1.0.2" -css-loader@^0.28.7: - version "0.28.8" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.8.tgz#ff36381464dea18fe60f2601a060ba6445886bd5" +css-loader@^0.28.9: + version "0.28.9" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.9.tgz#68064b85f4e271d7ce4c48a58300928e535d1c95" dependencies: babel-code-frame "^6.26.0" css-selector-tokenizer "^0.7.0" @@ -1665,7 +1679,7 @@ css-loader@^0.28.7: lodash.camelcase "^4.3.0" object-assign "^4.1.1" postcss "^5.0.6" - postcss-modules-extract-imports "^1.1.0" + postcss-modules-extract-imports "^1.2.0" postcss-modules-local-by-default "^1.2.0" postcss-modules-scope "^1.1.0" postcss-modules-values "^1.3.0" @@ -2004,15 +2018,9 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-releases@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e" - electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: - version "1.3.30" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80" - dependencies: - electron-releases "^2.1.0" + version "1.3.31" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f" elliptic@^6.0.0: version "6.4.0" @@ -2090,13 +2098,13 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.37" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" + version "0.10.38" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3" dependencies: - es6-iterator "~2.0.1" + es6-iterator "~2.0.3" es6-symbol "~3.1.1" -es6-iterator@^2.0.1, es6-iterator@~2.0.1: +es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: @@ -2555,9 +2563,9 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -flow-bin@^0.50.0: - version "0.50.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.50.0.tgz#d4cdb2430dee1a3599f0eb6fe551146e3027256a" +flow-bin@^0.63.1: + version "0.63.1" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.63.1.tgz#ab00067c197169a5fb5b4996c8f6927b06694828" flow-typed@^2.2.1: version "2.2.3" @@ -3561,8 +3569,8 @@ isurl@^1.0.0-alpha5: is-object "^1.0.1" js-base64@^2.1.9: - version "2.4.0" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa" + version "2.4.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.1.tgz#e02813181cd53002888e918935467acb2910e596" js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -3657,15 +3665,15 @@ jss-compose@^5.0.0: dependencies: warning "^3.0.0" -jss-default-unit@^8.0.0, jss-default-unit@^8.0.2: +jss-default-unit@^8.0.2: version "8.0.2" resolved "https://registry.yarnpkg.com/jss-default-unit/-/jss-default-unit-8.0.2.tgz#cc1e889bae4c0b9419327b314ab1c8e2826890e6" -jss-expand@^5.0.0: +jss-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/jss-expand/-/jss-expand-5.1.0.tgz#b1ad74ec18631f34f65a2124fcfceb6400610e3d" -jss-extend@^6.0.1: +jss-extend@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/jss-extend/-/jss-extend-6.1.0.tgz#85f3d39944018e8f44b322c14fa316068aa7bb0b" dependencies: @@ -3682,27 +3690,27 @@ jss-nested@^6.0.1: warning "^3.0.0" jss-preset-default@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.0.1.tgz#822cecb87c27ff91633774422f4c221d61486b65" + version "4.1.0" + resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-4.1.0.tgz#8a07d8de92cb0c55b70dc1919b802aed9cc4ebe9" dependencies: jss-camel-case "^6.0.0" jss-compose "^5.0.0" - jss-default-unit "^8.0.0" - jss-expand "^5.0.0" - jss-extend "^6.0.1" + jss-default-unit "^8.0.2" + jss-expand "^5.1.0" + jss-extend "^6.1.0" jss-global "^3.0.0" jss-nested "^6.0.1" jss-props-sort "^6.0.0" - jss-template "^1.0.0" + jss-template "^1.0.1" jss-vendor-prefixer "^7.0.0" jss-props-sort@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/jss-props-sort/-/jss-props-sort-6.0.0.tgz#9105101a3b5071fab61e2d85ea74cc22e9b16323" -jss-template@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.0.tgz#4b874608706ddceecacdb5567e254aecb6ea69b3" +jss-template@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/jss-template/-/jss-template-1.0.1.tgz#09aed9d86cc547b07f53ef355d7e1777f7da430a" dependencies: warning "^3.0.0" @@ -3770,9 +3778,9 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leaflet@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.2.0.tgz#fd5d93d9cb00091f5f8a69206d0d6744c1c82697" +leaflet@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e" leven@^1.0.0: version "1.0.2" @@ -3931,7 +3939,7 @@ map-visit@^1.0.0: buffers "~0.1.1" readable-stream "~1.0.0" -"material-ui-old@npm:material-ui@latest": +"material-ui-old@npm:material-ui@latest", "material-ui@npm:material-ui@latest": version "0.20.0" resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-0.20.0.tgz#85411bb59c916c9c7703f29dcffc44e3a67d5111" dependencies: @@ -3948,9 +3956,11 @@ map-visit@^1.0.0: warning "^3.0.0" "material-ui@npm:material-ui@next": - version "1.0.0-beta.27" - resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.27.tgz#f3073b7acffebd1fc6d0339a3260d4555445daf7" + version "1.0.0-beta.29" + resolved "https://registry.yarnpkg.com/material-ui/-/material-ui-1.0.0-beta.29.tgz#21ddf110d7aae4a6582584fc10ce948f144b1f2b" dependencies: + "@types/jss" "^9.3.0" + "@types/react-transition-group" "^2.0.6" babel-runtime "^6.26.0" brcast "^3.0.1" classnames "^2.2.5" @@ -4190,8 +4200,8 @@ multicast-dns-service-types@^1.1.0: resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" multicast-dns@^6.0.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.1.tgz#c5035defa9219d30640558a49298067352098060" + version "6.2.2" + resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.2.tgz#300b6133361f8aaaf2b8d1248e85c363fe5b95a0" dependencies: dns-packet "^1.0.1" thunky "^0.1.0" @@ -4437,8 +4447,8 @@ onetime@^2.0.0: mimic-fn "^1.0.0" opn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519" + version "5.2.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225" dependencies: is-wsl "^1.1.0" @@ -4819,9 +4829,9 @@ postcss-minify-selectors@^2.0.4: postcss "^5.0.14" postcss-selector-parser "^2.0.0" -postcss-modules-extract-imports@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" +postcss-modules-extract-imports@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" dependencies: postcss "^6.0.1" @@ -5038,8 +5048,8 @@ pump@^2.0.0: once "^1.3.1" pumpify@^1.3.5: - version "1.3.6" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.3.6.tgz#00d40e5ded0a3bf1e0788b1c0cf426a42882ab64" + version "1.4.0" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb" dependencies: duplexify "^3.5.3" inherits "^2.0.3" @@ -5128,8 +5138,8 @@ raw-body@2.3.2: unpipe "1.0.0" rc@^1.1.7: - version "1.2.3" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b" + version "1.2.4" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -5164,9 +5174,9 @@ react-jss@^8.1.0: prop-types "^15.6.0" theming "^1.3.0" -react-leaflet@^1.5.0: - version "1.7.8" - resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.7.8.tgz#5b58be948a7e2efe5c302a65746c9e8b25477c59" +react-leaflet@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.8.0.tgz#e33ba704910e2ad86dd29b5a4a52acb7030fe2c4" dependencies: lodash "^4.0.0" lodash-es "^4.0.0" @@ -5262,7 +5272,7 @@ readable-stream@1.0, readable-stream@~1.0.0, readable-stream@~1.0.31: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@> 1.0.0 < 3.0.0", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3: +"readable-stream@> 1.0.0 < 3.0.0", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5580,8 +5590,8 @@ selfsigned@^1.9.1: node-forge "0.6.33" "semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" + version "5.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" send@0.16.1: version "0.16.1" @@ -5892,12 +5902,12 @@ stream-browserify@^2.0.1: readable-stream "^2.0.2" stream-http@^2.7.2: - version "2.7.2" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" + version "2.8.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.2.6" + readable-stream "^2.3.3" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -6212,8 +6222,8 @@ ua-parser-js@^0.7.9: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" uglify-js@3.3.x: - version "3.3.6" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.6.tgz#3ca624e713f1981df455d72a02ab6ffe632b5d2d" + version "3.3.7" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.7.tgz#28463e7c7451f89061d2b235e30925bf5625e14d" dependencies: commander "~2.13.0" source-map "~0.6.1" @@ -6381,8 +6391,8 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" + version "3.2.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" v8flags@^2.1.1: version "2.1.1" @@ -6449,9 +6459,9 @@ webpack-dev-middleware@1.12.2: range-parser "^1.0.3" time-stamp "^2.0.0" -webpack-dev-server@^2.9.4: - version "2.10.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.10.1.tgz#a9768375346e62155860fe3cef3d4d641b24273e" +webpack-dev-server@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.0.tgz#e9d4830ab7eb16c6f92ed68b92f6089027960e1b" dependencies: ansi-html "0.0.7" array-includes "^3.0.3" From a5668b1f9501e8aca3b93acfdc11e05ba65c4124 Mon Sep 17 00:00:00 2001 From: uwap Date: Fri, 19 Jan 2018 17:26:07 +0100 Subject: [PATCH 26/26] Change travis build --- .flowconfig | 1 - .travis.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.flowconfig b/.flowconfig index de8b8f6..267709e 100644 --- a/.flowconfig +++ b/.flowconfig @@ -8,6 +8,5 @@ types/types.js [options] esproposal.export_star_as=enable -unsafe.enable_getters_and_setters=true module.system.node.resolve_dirname=node_modules module.system.node.resolve_dirname=src diff --git a/.travis.yml b/.travis.yml index 23cd14c..3687c35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js node_js: - - 7 + - 6 - 8 + - 9 script: - yarn travis cache: