updated aliases

This commit is contained in:
Fedor Katurov 2020-01-08 14:38:20 +07:00
parent af8d270460
commit e950d98b73
74 changed files with 300 additions and 390 deletions

View file

@ -1,9 +1,9 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { MODES } from '$constants/modes';
import { IStickerPack, STICKERS } from '$constants/stickers';
import { StickerIcon } from '$components/StickerIcon';
import { IRootReducer } from '$redux/user';
import { Icon } from '~/components/panels/Icon';
import { MODES } from '~/constants/modes';
import { IStickerPack, STICKERS } from '~/constants/stickers';
import { StickerIcon } from '~/components/StickerIcon';
import { IRootReducer } from '~/redux/user';
interface Props {
mode: IRootReducer['mode'],

View file

@ -43,6 +43,6 @@ export const Fills = () => (
<path d="m 2.625,3.375 h 7.5 L 10.28125,1.609375 13.5,4.25 10.484375,6.921875 10.171875,5.15625 2.625,5.125 Z" fill="#ff3344" fillRule="evenodd" />
</g>
</defs>
<image xlinkHref={require('$sprites/stickers/stickers-base.svg')} width={0} height={0} />
<image xlinkHref={require('~/sprites/stickers/stickers-base.svg')} width={0} height={0} />
</svg>
);

View file

@ -1,5 +1,5 @@
import React from 'react';
import { STICKERS } from '$constants/stickers';
import { STICKERS } from '~/constants/stickers';
type Props = {
set: string,

View file

@ -1,8 +1,8 @@
import React from 'react';
// import { marker } from 'leaflet';
// import { DomMarker } from '$utils/DomMarker';
// import { Icon } from '$components/panels/Icon';
// import { editor } from '$modules/Editor';
// import { DomMarker } from '~/utils/DomMarker';
// import { Icon } from '~/components/panels/Icon';
// import { editor } from '~/modules/Editor';
interface Props {

View file

@ -1,7 +1,7 @@
// @flow
import React from 'react';
import { Scroll } from '$components/Scroll';
import { APP_INFO } from '$constants/app_info';
import { Scroll } from '~/components/Scroll';
import { APP_INFO } from '~/constants/app_info';
export const AppInfoDialog = () => (
<div className="dialog-content">

View file

@ -1,8 +1,8 @@
import React from 'react';
import { MODES } from '$constants/modes';
import { Icon } from '$components/panels/Icon';
import { setMode, stopEditing } from "$redux/user/actions";
import { MODES } from '~/constants/modes';
import { Icon } from '~/components/panels/Icon';
import { setMode, stopEditing } from "~/redux/user/actions";
type Props = {
stopEditing: typeof stopEditing,

View file

@ -1,9 +1,9 @@
import React from 'react';
import { LOGOS } from '$constants/logos';
import { Icon } from '$components/panels/Icon';
import { LOGOS } from '~/constants/logos';
import { Icon } from '~/components/panels/Icon';
import classnames from 'classnames';
import * as MAP_ACTIONS from "$redux/map/actions"
import { selectMapLogo } from '$redux/map/selectors';
import * as MAP_ACTIONS from "~/redux/map/actions"
import { selectMapLogo } from '~/redux/map/selectors';
import { connect } from 'react-redux';
const mapStateToProps = state => ({

View file

@ -1,7 +1,7 @@
import React from 'react';
import { connect } from 'react-redux';
import { RouteRowWrapper } from '$components/maps/RouteRowWrapper';
import { Scroll } from '$components/Scroll';
import { RouteRowWrapper } from '~/components/maps/RouteRowWrapper';
import { Scroll } from '~/components/Scroll';
import {
searchSetDistance,
searchSetTitle,
@ -11,17 +11,17 @@ import {
dropRoute,
modifyRoute,
toggleRouteStarred,
} from '$redux/user/actions';
import { isMobile } from '$utils/window';
} from '~/redux/user/actions';
import { isMobile } from '~/utils/window';
import classnames from 'classnames';
import Range from 'rc-slider/lib/Range';
import { TABS, TABS_TITLES } from '$constants/dialogs';
import { Icon } from '$components/panels/Icon';
import { pushPath } from '$utils/history';
import { IRootState, IRouteListItem } from '$redux/user';
import { ROLES } from '$constants/auth';
import { IState } from '$redux/store';
import { TABS, TABS_TITLES } from '~/constants/dialogs';
import { Icon } from '~/components/panels/Icon';
import { pushPath } from '~/utils/history';
import { IRootState, IRouteListItem } from '~/redux/user';
import { ROLES } from '~/constants/auth';
import { IState } from '~/redux/store';
export interface IMapListDialogProps extends IRootState {
marks: { [x: number]: string };

View file

@ -1,9 +1,9 @@
import React from 'react';
import { PROVIDERS, replaceProviderUrl } from '$constants/providers';
import { Icon } from '$components/panels/Icon';
import { PROVIDERS, replaceProviderUrl } from '~/constants/providers';
import { Icon } from '~/components/panels/Icon';
import classnames from 'classnames';
import * as MAP_ACTIONS from "$redux/map/actions";
import { selectMapProvider } from '$redux/map/selectors';
import * as MAP_ACTIONS from "~/redux/map/actions";
import { selectMapProvider } from '~/redux/map/selectors';
import { connect } from 'react-redux';
const mapStateToProps = state => ({

View file

@ -1,9 +1,9 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { Icon } from '~/components/panels/Icon';
import {
routerCancel as routerCancelAction,
routerSubmit as routerSubmitAction,
} from "$redux/user/actions";
} from "~/redux/user/actions";
import classnames from "classnames";
type Props = {

View file

@ -1,17 +1,17 @@
import React from 'react';
import { copyToClipboard, getUrlData } from '$utils/history';
import { toTranslit, parseDesc } from '$utils/format';
import { TIPS } from '$constants/tips';
import { MODES } from '$constants/modes';
import { Icon } from '$components/panels/Icon';
import { Switch } from '$components/Switch';
import { copyToClipboard, getUrlData } from '~/utils/history';
import { toTranslit, parseDesc } from '~/utils/format';
import { TIPS } from '~/constants/tips';
import { MODES } from '~/constants/modes';
import { Icon } from '~/components/panels/Icon';
import { Switch } from '~/components/Switch';
import classnames from 'classnames';
import ExpandableTextarea from 'react-expandable-textarea';
import { connect } from 'react-redux';
import { selectMap } from '$redux/map/selectors';
import { selectUser } from '$redux/user/selectors';
import * as USER_ACTIONS from '$redux/user/actions';
import { selectMap } from '~/redux/map/selectors';
import { selectUser } from '~/redux/user/selectors';
import * as USER_ACTIONS from '~/redux/user/actions';
const mapStateToProps = state => ({
map: selectMap(state),

View file

@ -1,6 +1,6 @@
import React from 'react';
import { connect } from 'react-redux';
import { selectUserRenderer } from '$redux/user/selectors';
import { selectUserRenderer } from '~/redux/user/selectors';
const mapStateToProps = state => ({
renderer: selectUserRenderer(state),

View file

@ -1,8 +1,8 @@
// @flow
import React from 'react';
import { STICKERS } from '$constants/stickers';
import { setActiveSticker as setActiveStickerAction } from "$redux/user/actions";
import { STICKERS } from '~/constants/stickers';
import { setActiveSticker as setActiveStickerAction } from "~/redux/user/actions";
interface Props {
setActiveSticker: typeof setActiveStickerAction,

View file

@ -2,11 +2,11 @@ import React from 'react';
import { connect } from 'react-redux';
import classnames from 'classnames';
import { getStyle } from '$utils/dom';
import { nearestInt } from '$utils/geom';
import { parseDesc } from '$utils/format';
import { selectUser } from '$redux/user/selectors';
import { selectMap } from '$redux/map/selectors';
import { getStyle } from '~/utils/dom';
import { nearestInt } from '~/utils/geom';
import { parseDesc } from '~/utils/format';
import { selectUser } from '~/redux/user/selectors';
import { selectMap } from '~/redux/map/selectors';
const mapStateToProps = state => ({
user: selectUser(state),

View file

@ -1,5 +1,5 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { Icon } from '~/components/panels/Icon';
type Props = {
clearPoly: () => void,

View file

@ -1,8 +1,8 @@
import React from 'react';
import { LOGOS } from '$constants/logos';
import { LOGOS } from '~/constants/logos';
import { connect } from 'react-redux';
import { IRootState } from '$redux/user';
import { selectMapLogo } from '$redux/map/selectors';
import { IRootState } from '~/redux/user';
import { selectMapLogo } from '~/redux/map/selectors';
const mapStateToProps = state => ({ logo: selectMapLogo(state) });
type Props = ReturnType<typeof mapStateToProps>;

View file

@ -1,8 +1,8 @@
// @flow
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { MapListDialog } from "$components/dialogs/MapListDialog";
import { Tooltip } from "$components/panels/Tooltip";
import { Icon } from '~/components/panels/Icon';
import { MapListDialog } from "~/components/dialogs/MapListDialog";
import { Tooltip } from "~/components/panels/Tooltip";
import { ReactElement } from "react";
interface Props {

View file

@ -1,8 +1,8 @@
// @flow
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { Switch } from '$components/Switch';
import { MapListDialog } from "$components/dialogs/MapListDialog";
import { Icon } from '~/components/panels/Icon';
import { Switch } from '~/components/Switch';
import { MapListDialog } from "~/components/dialogs/MapListDialog";
interface Props {
title: string;

View file

@ -1,12 +1,12 @@
// @flow
import React from "react";
import { Icon } from "$components/panels/Icon";
import { MapListDialog } from "$components/dialogs/MapListDialog";
import { Tooltip } from "$components/panels/Tooltip";
import { Icon } from "~/components/panels/Icon";
import { MapListDialog } from "~/components/dialogs/MapListDialog";
import { Tooltip } from "~/components/panels/Tooltip";
import { ReactElement } from "react";
import classnames from "classnames";
import { toggleRouteStarred } from "$redux/user/actions";
import { TABS } from "$constants/dialogs";
import { toggleRouteStarred } from "~/redux/user/actions";
import { TABS } from "~/constants/dialogs";
interface Props {
tab: string;

View file

@ -1,9 +1,9 @@
import React from "react";
import classnames from "classnames";
import { MapListDialog } from "$components/dialogs/MapListDialog";
import { RouteRowView } from "$components/maps/RouteRowView";
import { RouteRowEditor } from "$components/maps/RouteRowEditor";
import { RouteRowDrop } from "$components/maps/RouteRowDrop";
import { MapListDialog } from "~/components/dialogs/MapListDialog";
import { RouteRowView } from "~/components/maps/RouteRowView";
import { RouteRowEditor } from "~/components/maps/RouteRowEditor";
import { RouteRowDrop } from "~/components/maps/RouteRowDrop";
import { ReactElement } from "react";
interface Props {

View file

@ -1,15 +1,15 @@
// flow
import React from 'react';
import { toHours } from '$utils/format';
import { Icon } from '$components/panels/Icon';
import { toHours } from '~/utils/format';
import { Icon } from '~/components/panels/Icon';
import { connect } from 'react-redux';
// import Slider from 'rc-slider';
import Slider from 'rc-slider/lib/Slider';
import { bindActionCreators } from 'redux';
import { setSpeed } from '$redux/user/actions';
import { IRootState } from "$redux/user";
import { Tooltip } from "$components/panels/Tooltip";
import { isMobile } from "$utils/window";
import { setSpeed } from '~/redux/user/actions';
import { IRootState } from "~/redux/user";
import { Tooltip } from "~/components/panels/Tooltip";
import { isMobile } from "~/utils/window";
interface Props extends IRootState {
setSpeed: typeof setSpeed,

View file

@ -1,18 +1,18 @@
import React, { createElement } from 'react';
import { MODES } from '$constants/modes';
import { MODES } from '~/constants/modes';
import { RouterDialog } from '$components/dialogs/RouterDialog';
import { StickersDialog } from '$components/dialogs/StickersDialog';
import { TrashDialog } from '$components/dialogs/TrashDialog';
import { LogoDialog } from '$components/dialogs/LogoDialog';
import { SaveDialog } from '$components/dialogs/SaveDialog';
import { CancelDialog } from '$components/dialogs/CancelDialog';
import { RouterDialog } from '~/components/dialogs/RouterDialog';
import { StickersDialog } from '~/components/dialogs/StickersDialog';
import { TrashDialog } from '~/components/dialogs/TrashDialog';
import { LogoDialog } from '~/components/dialogs/LogoDialog';
import { SaveDialog } from '~/components/dialogs/SaveDialog';
import { CancelDialog } from '~/components/dialogs/CancelDialog';
import { connect } from 'react-redux';
import { ProviderDialog } from '$components/dialogs/ProviderDialog';
import { ShotPrefetchDialog } from '$components/dialogs/ShotPrefetchDialog';
import { selectUserMode } from '$redux/user/selectors';
import { ProviderDialog } from '~/components/dialogs/ProviderDialog';
import { ShotPrefetchDialog } from '~/components/dialogs/ShotPrefetchDialog';
import { selectUserMode } from '~/redux/user/selectors';
const mapStateToProps = state => ({ mode: selectUserMode(state) });

View file

@ -1,14 +1,14 @@
import React from 'react';
import { MODES } from '$constants/modes';
import { MODES } from '~/constants/modes';
import classnames from 'classnames';
import { Icon } from '$components/panels/Icon';
import { EditorDialog } from '$components/panels/EditorDialog';
import { Icon } from '~/components/panels/Icon';
import { EditorDialog } from '~/components/panels/EditorDialog';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { setMode, startEditing, stopEditing, takeAShot, keyPressed } from '$redux/user/actions';
import { IRootState } from "$redux/user";
import { Tooltip } from "$components/panels/Tooltip";
import { setMode, startEditing, stopEditing, takeAShot, keyPressed } from '~/redux/user/actions';
import { IRootState } from "~/redux/user";
import { Tooltip } from "~/components/panels/Tooltip";
interface Props extends IRootState {
routing: IRootState['features']['routing'],

View file

@ -4,7 +4,7 @@ export const Icon = ({ icon, size = 32 }: { icon: string, size?: number }) => (
<svg width={size} height={size} viewBox="0 0 32 32">
<defs>
<mask id={`icon-mask-${icon}`}>
<use xlinkHref={`${require('$sprites/icon.svg')}#${icon}`} x={0} y={0} />
<use xlinkHref={`${require('~/sprites/icon.svg')}#${icon}`} x={0} y={0} />
</mask>
</defs>
<rect x="0" y="0" width="32" height="32" stroke="none" mask={`url(#icon-mask-${icon})`} />

View file

@ -1,5 +1,5 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { Icon } from '~/components/panels/Icon';
type Props = {
onCancel: () => void,

View file

@ -1,6 +1,6 @@
import React from 'react';
import { UserLocation } from '$components/UserLocation';
import { DistanceBar } from '$components/panels/DistanceBar';
import { UserLocation } from '~/components/UserLocation';
import { DistanceBar } from '~/components/panels/DistanceBar';
export const TopLeftPanel = () => (
<div className="status-panel top left">

View file

@ -1,16 +1,16 @@
// flow
import React, { useCallback } from 'react';
import { Icon } from '$components/panels/Icon';
import { PROVIDERS } from '$constants/providers';
import { LOGOS } from '$constants/logos';
import * as USER_ACTIONS from '$redux/user/actions';
import { Icon } from '~/components/panels/Icon';
import { PROVIDERS } from '~/constants/providers';
import { LOGOS } from '~/constants/logos';
import * as USER_ACTIONS from '~/redux/user/actions';
import { connect } from 'react-redux';
import { MODES } from '$constants/modes';
import { IRootState } from '$redux/user';
import { MODES } from '~/constants/modes';
import { IRootState } from '~/redux/user';
import { Tooltip } from '$components/panels/Tooltip';
import { selectMap } from '$redux/map/selectors';
import { selectUser } from '$redux/user/selectors';
import { Tooltip } from '~/components/panels/Tooltip';
import { selectMap } from '~/redux/map/selectors';
import { selectUser } from '~/redux/user/selectors';
const mapStateToProps = state => ({
map: selectMap(state),

View file

@ -1,9 +1,9 @@
import React, { PureComponent } from 'react';
import { GuestButton } from '$components/user/GuestButton';
import { DEFAULT_USER, IUser, ROLES } from '$constants/auth';
import { UserButton } from '$components/user/UserButton';
import { UserMenu } from '$components/user/UserMenu';
import { GuestButton } from '~/components/user/GuestButton';
import { DEFAULT_USER, ROLES } from '~/constants/auth';
import { UserButton } from '~/components/user/UserButton';
import { UserMenu } from '~/components/user/UserMenu';
import {
setUser,
userLogout,
@ -13,16 +13,16 @@ import {
setDialogActive,
openMapDialog,
getGPXTrack,
} from '$redux/user/actions';
} from '~/redux/user/actions';
import { connect } from 'react-redux';
import { Icon } from '$components/panels/Icon';
import { Icon } from '~/components/panels/Icon';
import classnames from 'classnames';
import { CLIENT } from '$config/frontend';
import { DIALOGS, TABS } from '$constants/dialogs';
import { IRootState } from '$redux/user';
import { Tooltip } from '$components/panels/Tooltip';
import { TitleDialog } from '$components/dialogs/TitleDialog';
import { CLIENT } from '~/config/frontend';
import { DIALOGS, TABS } from '~/constants/dialogs';
import { IRootState } from '~/redux/user';
import { Tooltip } from '~/components/panels/Tooltip';
import { TitleDialog } from '~/components/dialogs/TitleDialog';
interface Props extends IRootState {
userLogout: typeof userLogout;

View file

@ -1,14 +1,14 @@
import React from 'react';
import { hideRenderer, cropAShot } from '$redux/user/actions';
import { hideRenderer, cropAShot } from '~/redux/user/actions';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Croppr from 'croppr';
import 'croppr/dist/croppr.css';
import { LOGOS } from '$constants/logos';
import { RendererPanel } from '$components/panels/RendererPanel';
import { IRootState } from "$redux/user";
import { IRoute } from '$redux/map/types';
import { LOGOS } from '~/constants/logos';
import { RendererPanel } from '~/components/panels/RendererPanel';
import { IRootState } from "~/redux/user";
import { IRoute } from '~/redux/map/types';
type Props = {
data: IRootState['renderer']['data'],

View file

@ -1,5 +1,5 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
import { Icon } from '~/components/panels/Icon';
type Props = {
onClick: () => void,

View file

@ -1,7 +1,7 @@
// @flow
import React from "react";
import { UserPicture } from "$components/user/UserPicture";
import { IUser } from "$constants/auth";
import { UserPicture } from "~/components/user/UserPicture";
import { IUser } from "~/constants/auth";
interface Props {
user: IUser;

View file

@ -1,6 +1,6 @@
import React from 'react';
import { APP_INFO } from '$constants/app_info';
import { userLogout } from "$redux/user/actions";
import { APP_INFO } from '~/constants/app_info';
import { userLogout } from "~/redux/user/actions";
interface Props {
userLogout: typeof userLogout,