Progress on refactor
Update files paths, components
This commit is contained in:
@@ -3,16 +3,16 @@ import { FormattedDate, FormattedNumber } from 'react-intl';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import classNames from 'classnames';
|
||||
import scheduleIdleTask from '../../../../utils/schedule_idle_task';
|
||||
import StatusQuote from '../../../../components/status_quote';
|
||||
import Avatar from '../../../../components/avatar';
|
||||
import DisplayName from '../../../../components/display_name';
|
||||
import StatusContent from '../../../../components/status_content';
|
||||
import MediaGallery from '../../../../components/media_gallery';
|
||||
import Card from '../card';
|
||||
import Video from '../../../video';
|
||||
import scheduleIdleTask from '../../../../utils/schedule_idle_task';
|
||||
import Icon from '../../../../components/icon';
|
||||
import Poll from '../../../../components/poll';
|
||||
import Card from '../card';
|
||||
import Video from '../../../video';
|
||||
|
||||
import './detailed_status.scss';
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { defineMessages, injectIntl } from 'react-intl';
|
||||
import DropdownMenuContainer from '../../../../containers/dropdown_menu_container';
|
||||
import { openModal } from '../../../../actions/modal';
|
||||
import IconButton from '../../../../components/icon_button';
|
||||
import { me, isStaff } from '../../../../initial_state';
|
||||
import DropdownMenuContainer from '../../../../containers/dropdown_menu_container';
|
||||
import IconButton from '../../../../components/icon_button';
|
||||
|
||||
import './detailed_status_action_bar.scss';
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import DetailedStatus from '../components/detailed_status';
|
||||
import { makeGetStatus } from '../../../selectors';
|
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||
import {
|
||||
replyCompose,
|
||||
mentionCompose,
|
||||
@@ -24,9 +23,10 @@ import {
|
||||
import { initMuteModal } from '../../../actions/mutes';
|
||||
import { initReport } from '../../../actions/reports';
|
||||
import { openModal } from '../../../actions/modal';
|
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||
import { boostModal, deleteModal } from '../../../initial_state';
|
||||
import { showAlertForError } from '../../../actions/alerts';
|
||||
import { boostModal, deleteModal } from '../../../initial_state';
|
||||
import { makeGetStatus } from '../../../selectors';
|
||||
import DetailedStatus from '../components/detailed_status';
|
||||
|
||||
const messages = defineMessages({
|
||||
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
||||
|
||||
@@ -5,9 +5,6 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { HotKeys } from 'react-hotkeys';
|
||||
import { fetchStatus } from '../../actions/statuses';
|
||||
import DetailedStatus from './components/detailed_status';
|
||||
import ActionBar from './components/detailed_status_action_bar';
|
||||
import Column from '../../components/column';
|
||||
import {
|
||||
favourite,
|
||||
unfavourite,
|
||||
@@ -31,15 +28,18 @@ import {
|
||||
} from '../../actions/statuses';
|
||||
import { initMuteModal } from '../../actions/mutes';
|
||||
import { initReport } from '../../actions/reports';
|
||||
import { makeGetStatus } from '../../selectors';
|
||||
import { ColumnHeader } from '../../components/column_header';
|
||||
import StatusContainer from '../../containers/status_container';
|
||||
import { openModal } from '../../actions/modal';
|
||||
import { boostModal, deleteModal, me } from '../../initial_state';
|
||||
import { makeGetStatus } from '../../selectors';
|
||||
import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../../utils/fullscreen';
|
||||
import StatusContainer from '../../containers/status_container';
|
||||
import { ColumnHeader } from '../../components/column_header';
|
||||
import { textForScreenReader, defaultMediaVisibility } from '../../components/status/status';
|
||||
import Icon from '../../components/icon';
|
||||
import ColumnIndicator from '../../components/column_indicator';
|
||||
import DetailedStatus from './components/detailed_status';
|
||||
import ActionBar from './components/detailed_status_action_bar';
|
||||
import Column from '../../components/column';
|
||||
|
||||
const messages = defineMessages({
|
||||
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
||||
@@ -417,7 +417,6 @@ class Status extends ImmutablePureComponent {
|
||||
render () {
|
||||
let ancestors, descendants;
|
||||
const { status, ancestorsIds, descendantsIds, intl, domain } = this.props;
|
||||
const { fullscreen } = this.state;
|
||||
|
||||
if (status === null) {
|
||||
return (<ColumnIndicator type='loading' />);
|
||||
|
||||
Reference in New Issue
Block a user