diff --git a/package-lock.json b/package-lock.json index a283bb5..54a5623 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10130,6 +10130,11 @@ "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==", "optional": true }, + "pt-sans-cyrillic": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/pt-sans-cyrillic/-/pt-sans-cyrillic-0.0.4.tgz", + "integrity": "sha512-QbXgUHp5pbSbxbLdfpe5/MzuYPufqv36UMQUUI7QwceaaCJA8NQilysjlexjHLyK0GFv7NB5kl6ZAcIMBBBRXA==" + }, "public-encrypt": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", @@ -10209,6 +10214,11 @@ "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", "dev": true }, + "raleway-cyrillic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/raleway-cyrillic/-/raleway-cyrillic-4.0.2.tgz", + "integrity": "sha1-HcKzrqYwKwhTbs7jGIyS0li4jOE=" + }, "ramda": { "version": "0.24.1", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz", diff --git a/package.json b/package.json index 80e8ae4..d37bb7a 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,8 @@ "leaflet-routing-machine": "muerwre/leaflet-routing-machine#no-osrm-text", "less": "^3.8.1", "lodash": "^4.17.10", + "pt-sans-cyrillic": "0.0.4", + "raleway-cyrillic": "^4.0.2", "react": "^16.3.2", "react-dom": "^16.3.2", "react-hot-loader": "^4.1.1", diff --git a/src/components/panels/EditorDialog.jsx b/src/components/panels/EditorDialog.jsx index e8a4565..a230e5f 100644 --- a/src/components/panels/EditorDialog.jsx +++ b/src/components/panels/EditorDialog.jsx @@ -5,15 +5,17 @@ import { RouterDialog } from '$components/router/RouterDialog'; import { StickersDialog } from '$components/stickers/StickersDialog'; import { TrashDialog } from '$components/trash/TrashDialog'; import { LogoDialog } from '$components/logo/LogoDialog'; +import { SaveDialog } from '$components/save/SaveDialog'; export const EditorDialog = ({ - mode, routerPoints, editor, activeSticker, logo + mode, routerPoints, editor, activeSticker, logo, user, }) => { const showDialog = ( mode === MODES.ROUTER || (mode === MODES.STICKERS && !activeSticker) || mode === MODES.TRASH || mode === MODES.LOGO + || mode === MODES.SAVE ); return ( @@ -23,6 +25,7 @@ export const EditorDialog = ({ { mode === MODES.STICKERS && } { mode === MODES.TRASH && } { mode === MODES.LOGO && } + { mode === MODES.SAVE && } ); }; diff --git a/src/components/panels/EditorPanel.jsx b/src/components/panels/EditorPanel.jsx index 97ee003..fab5895 100644 --- a/src/components/panels/EditorPanel.jsx +++ b/src/components/panels/EditorPanel.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { MODES } from '$constants/modes'; import classnames from 'classnames'; -import { toHours } from '$utils/time'; +import { toHours } from '$utils/format'; import { Icon } from '$components/panels/Icon'; import { EditorDialog } from '$components/panels/EditorDialog'; @@ -21,9 +21,11 @@ export class EditorPanel extends React.PureComponent { startLogoMode = () => this.props.editor.changeMode(MODES.LOGO); + startSaveMode = () => this.props.editor.changeMode(MODES.SAVE); + render() { const { - mode, routerPoints, editor, totalDistance, estimateTime, activeSticker, logo, + mode, routerPoints, editor, totalDistance, estimateTime, activeSticker, logo, user } = this.props; return ( @@ -35,6 +37,7 @@ export class EditorPanel extends React.PureComponent { activeSticker={activeSticker} editor={editor} logo={logo} + user={user} /> @@ -96,6 +99,7 @@ export class EditorPanel extends React.PureComponent {