refacor all the things \o/

This commit is contained in:
uwap 2017-09-19 10:12:32 +02:00
parent d729d949bd
commit 538162d38c
15 changed files with 721 additions and 402 deletions

View file

@ -3,6 +3,7 @@ import React from "react";
import AppBar from "material-ui/AppBar";
import CircularProgress from "material-ui/CircularProgress";
import MapIcon from "material-ui/svg-icons/maps/map";
import PhonelinkOffIcon from "material-ui/svg-icons/hardware/phonelink-off";
import IconMenu from "material-ui/IconMenu";
import IconButton from "material-ui/IconButton";
import MenuItem from "material-ui/MenuItem";
@ -13,19 +14,24 @@ const TopBarIndicatorMenu = (props: Object) => (
iconButtonElement={
<IconButton style={{width:48, height:48, padding: 0}}
iconStyle={{width:48, height: 48}}
tooltip="Connected!">
<MapIcon color={grey50} />
tooltip={props.mqtt.connected ? "Connected!" : "Disconnected!"}>
{props.mqtt.connected ?
(<MapIcon color={grey50} />) :
(<PhonelinkOffIcon color={grey50} />)}
</IconButton>}
style={{width:48, height:48}}>
<MenuItem primaryText="Reconnect" />
<MenuItem primaryText="Reconnect (Not yet implemented)" />
</IconMenu>
);
const TopBarIndicator = (props: Object) => (
props.mqtt == null ? <CircularProgress size={48} color={grey50} />
: <TopBarIndicatorMenu {...props} />
);
const TopBarIndicator = (props: Object) => {
if (props.mqtt == null || props.mqtt.reconnecting) {
return (<CircularProgress size={48} color={grey50} />);
} else {
return (<TopBarIndicatorMenu {...props} />);
}
};
const TopBar = (props: Object) => (
<AppBar title={props.title}