diff --git a/src/components/Button.jsx b/src/components/Button.jsx new file mode 100644 index 00000000..11065b22 --- /dev/null +++ b/src/components/Button.jsx @@ -0,0 +1,29 @@ +import React from 'react' +import colors from '../config/colors' +import { margins, fontSizes } from '../config/scales' + +class Button extends React.Component { + static propTypes = { + onClick: React.PropTypes.func.isRequired, + style: React.PropTypes.object, + } + + render() { + return + {this.props.children} + + } +} + +export default Button diff --git a/src/components/Paragraph.jsx b/src/components/Paragraph.jsx new file mode 100644 index 00000000..bd4c842a --- /dev/null +++ b/src/components/Paragraph.jsx @@ -0,0 +1,13 @@ +import React from 'react' +import colors from '../config/colors' +import { margins, fontSizes } from '../config/scales' + +const Paragraph = (props) =>
+ {props.children} +
+ +export default Paragraph diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx index 2d5715eb..d20810a4 100644 --- a/src/components/Toolbar.jsx +++ b/src/components/Toolbar.jsx @@ -17,6 +17,7 @@ import MdFindInPage from 'react-icons/lib/md/find-in-page' import SettingsModal from './modals/SettingsModal' import SourcesModal from './modals/SourcesModal' +import OpenModal from './modals/OpenModal' import style from '../libs/style' import colors from '../config/colors' @@ -37,6 +38,7 @@ const ToolbarAction = props => + export default class Toolbar extends React.Component { static propTypes = { mapStyle: React.PropTypes.object.isRequired, @@ -54,21 +56,10 @@ export default class Toolbar extends React.Component { this.state = { openSettingsModal: false, openSourcesModal: false, + openOpenModal: false, } } - onUpload(_, files) { - const [e, file] = files[0]; - const reader = new FileReader(); - reader.readAsText(file, "UTF-8"); - reader.onload = e => { - let mapStyle = JSON.parse(e.target.result) - mapStyle = style.ensureMetadataExists(mapStyle) - this.props.onStyleUpload(mapStyle); - } - reader.onerror = e => console.log(e.target); - } - saveButton() { if(this.props.mapStyle.layers.length > 0) { returnAdd a new source to your style. You can only choose the source type and id at creation time!
-Add one of the publicly availble sources to your style.
+