Fix import order
parent
ba4c8a9b41
commit
e47c582283
|
@ -2,11 +2,12 @@ import PropTypes from 'prop-types';
|
||||||
|
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
|
||||||
|
import classNames from 'classnames';
|
||||||
|
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
|
||||||
import { length } from 'stringz';
|
import { length } from 'stringz';
|
||||||
import classNames from 'classnames';
|
|
||||||
|
|
||||||
import { maxChars } from 'flavours/glitch/initial_state';
|
import { maxChars } from 'flavours/glitch/initial_state';
|
||||||
import { isMobile } from 'flavours/glitch/is_mobile';
|
import { isMobile } from 'flavours/glitch/is_mobile';
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
import { Fragment } from 'react';
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Check } from 'flavours/glitch/components/check';
|
import { Fragment } from 'react';
|
||||||
|
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
|
||||||
|
import { Check } from 'flavours/glitch/components/check';
|
||||||
|
|
||||||
|
|
||||||
const ProgressIndicator = ({ steps, completed }) => (
|
const ProgressIndicator = ({ steps, completed }) => (
|
||||||
<div className='onboarding__progress-indicator'>
|
<div className='onboarding__progress-indicator'>
|
||||||
{(new Array(steps)).fill().map((_, i) => (
|
{(new Array(steps)).fill().map((_, i) => (
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Icon } from 'flavours/glitch/components/icon';
|
|
||||||
import { Check } from 'flavours/glitch/components/check';
|
import { Check } from 'flavours/glitch/components/check';
|
||||||
|
import { Icon } from 'flavours/glitch/components/icon';
|
||||||
|
|
||||||
const Step = ({ label, description, icon, completed, onClick, href }) => {
|
const Step = ({ label, description, icon, completed, onClick, href }) => {
|
||||||
const content = (
|
const content = (
|
||||||
|
|
|
@ -1,16 +1,20 @@
|
||||||
import { PureComponent } from 'react';
|
|
||||||
import Column from 'flavours/glitch/components/column';
|
|
||||||
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import { PureComponent } from 'react';
|
||||||
|
|
||||||
|
import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
|
||||||
|
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
import { fetchSuggestions } from 'flavours/glitch/actions/suggestions';
|
import { fetchSuggestions } from 'flavours/glitch/actions/suggestions';
|
||||||
import { markAsPartial } from 'flavours/glitch/actions/timelines';
|
import { markAsPartial } from 'flavours/glitch/actions/timelines';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import Column from 'flavours/glitch/components/column';
|
||||||
import Account from 'flavours/glitch/containers/account_container';
|
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
||||||
import { EmptyAccount } from 'flavours/glitch/components/empty_account';
|
import { EmptyAccount } from 'flavours/glitch/components/empty_account';
|
||||||
import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
|
import Account from 'flavours/glitch/containers/account_container';
|
||||||
import { makeGetAccount } from 'flavours/glitch/selectors';
|
|
||||||
import { me } from 'flavours/glitch/initial_state';
|
import { me } from 'flavours/glitch/initial_state';
|
||||||
|
import { makeGetAccount } from 'flavours/glitch/selectors';
|
||||||
|
|
||||||
import ProgressIndicator from './components/progress_indicator';
|
import ProgressIndicator from './components/progress_indicator';
|
||||||
|
|
||||||
const mapStateToProps = () => {
|
const mapStateToProps = () => {
|
||||||
|
|
|
@ -1,16 +1,22 @@
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
import { PureComponent } from 'react';
|
import { PureComponent } from 'react';
|
||||||
|
|
||||||
|
import { defineMessages, injectIntl, FormattedMessage, FormattedHTMLMessage } from 'react-intl';
|
||||||
|
|
||||||
|
import classNames from 'classnames';
|
||||||
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import SwipeableViews from 'react-swipeable-views';
|
||||||
|
|
||||||
import Column from 'flavours/glitch/components/column';
|
import Column from 'flavours/glitch/components/column';
|
||||||
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { me, domain } from 'flavours/glitch/initial_state';
|
|
||||||
import { connect } from 'react-redux';
|
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
||||||
import { defineMessages, injectIntl, FormattedMessage, FormattedHTMLMessage } from 'react-intl';
|
|
||||||
import classNames from 'classnames';
|
|
||||||
import { Icon } from 'flavours/glitch/components/icon';
|
import { Icon } from 'flavours/glitch/components/icon';
|
||||||
|
import { me, domain } from 'flavours/glitch/initial_state';
|
||||||
|
|
||||||
import ArrowSmallRight from './components/arrow_small_right';
|
import ArrowSmallRight from './components/arrow_small_right';
|
||||||
import { Link } from 'react-router-dom';
|
|
||||||
import SwipeableViews from 'react-swipeable-views';
|
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },
|
shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },
|
||||||
|
|
|
@ -14,11 +14,11 @@ import { HotKeys } from 'react-hotkeys';
|
||||||
|
|
||||||
import { changeLayout } from 'flavours/glitch/actions/app';
|
import { changeLayout } from 'flavours/glitch/actions/app';
|
||||||
import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
|
import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
|
||||||
|
import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
|
||||||
import PermaLink from 'flavours/glitch/components/permalink';
|
import PermaLink from 'flavours/glitch/components/permalink';
|
||||||
import PictureInPicture from 'flavours/glitch/features/picture_in_picture';
|
import PictureInPicture from 'flavours/glitch/features/picture_in_picture';
|
||||||
import { layoutFromWindow } from 'flavours/glitch/is_mobile';
|
import { layoutFromWindow } from 'flavours/glitch/is_mobile';
|
||||||
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
|
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
|
||||||
import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
|
|
||||||
|
|
||||||
import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
|
import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
|
||||||
import { clearHeight } from '../../actions/height_cache';
|
import { clearHeight } from '../../actions/height_cache';
|
||||||
|
|
Loading…
Reference in New Issue