add controls popup

pull/351/head
MrChristofferson 2017-07-07 23:23:25 -05:00
parent 596462c349
commit 98b7fc56b6
2 changed files with 5 additions and 2 deletions

View File

@ -2,6 +2,7 @@ import * as React from "react";
import { connect } from "react-redux";
import * as _ from "lodash";
import { init, error } from "farmbot-toastr";
import { NavBar } from "./nav";
import { Everything, Log } from "./interfaces";
import { Spinner } from "./spinner";
@ -9,6 +10,7 @@ import { BotState } from "./devices/interfaces";
import { ResourceName, TaggedUser } from "./resources/tagged_resources";
import { selectAllLogs, maybeFetchUser } from "./resources/selectors";
import { HotKeys } from "./hotkeys";
import { ControlsPopup } from "./controls_popup";
/** Remove 300ms delay on touch devices - https://github.com/ftlabs/fastclick */
let fastClick = require("fastclick");
@ -85,6 +87,7 @@ export default class App extends React.Component<AppProps, {}> {
/>
{!syncLoaded && <Spinner radius={33} strokeWidth={6} />}
{syncLoaded && this.props.children}
<ControlsPopup />
</div>;
}
}

View File

@ -4,8 +4,8 @@ export class ControlsPopup extends React.Component {
public render() {
return (
<div>
Popup!
</div>
{/*Popup!*/}
</div>
);
}
}