diff --git a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js b/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js index f4f5ec94..b7d553dc 100644 --- a/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js +++ b/app/javascript/gabsocial/components/tabs_bar/tabs_bar.js @@ -4,9 +4,9 @@ import { NavLink, withRouter } from 'react-router-dom'; import { FormattedMessage } from 'react-intl'; import { me } from '../../initial_state'; import NotificationsCounter from '../notification_counter'; -import SearchContainer from 'gabsocial/features/compose/containers/search_container'; +import SearchContainer from '../../features/compose/containers/search_container'; import Avatar from '../avatar'; -import ActionBar from 'gabsocial/features/compose/components/action_bar'; +import ActionBar from '../../features/compose/components/action_bar'; import { openModal } from '../../actions/modal'; import GabLogo from './assets/gab_logo/gab_logo'; import { diff --git a/app/javascript/gabsocial/containers/media_container.js b/app/javascript/gabsocial/containers/media_container.js index 7788da90..6f48e9ed 100644 --- a/app/javascript/gabsocial/containers/media_container.js +++ b/app/javascript/gabsocial/containers/media_container.js @@ -1,14 +1,14 @@ import { Fragment } from 'react'; import ReactDOM from 'react-dom'; +import { List as ImmutableList, fromJS } from 'immutable'; import { IntlProvider, addLocaleData } from 'react-intl'; import { getLocale } from '../locales'; -import MediaGallery from '../components/media_gallery'; import Video from '../features/video'; import Card from '../features/status/components/card'; -import Poll from 'gabsocial/components/poll'; +import Poll from '../components/poll'; +import MediaGallery from '../components/media_gallery'; import ModalRoot from '../components/modal_root'; import { MediaModal } from '../components/modal'; -import { List as ImmutableList, fromJS } from 'immutable'; const { localeData, messages } = getLocale(); addLocaleData(localeData); diff --git a/app/javascript/gabsocial/containers/status_list_container.js b/app/javascript/gabsocial/containers/status_list_container.js index 9fda6092..cd657643 100644 --- a/app/javascript/gabsocial/containers/status_list_container.js +++ b/app/javascript/gabsocial/containers/status_list_container.js @@ -1,10 +1,9 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { createSelector } from 'reselect'; -import { debounce } from 'lodash'; +import { debounce, sample } from 'lodash'; import { me, promotions } from '../initial_state'; -import { dequeueTimeline } from 'gabsocial/actions/timelines'; +import { dequeueTimeline } from '../actions/timelines'; import { scrollTopTimeline } from '../actions/timelines'; -import { sample } from 'lodash'; import { fetchStatus } from '../actions/statuses'; import StatusList from '../components/status_list'; diff --git a/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js b/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js index 7a82d086..a442f4c8 100644 --- a/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js +++ b/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js @@ -1,14 +1,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Icon from '../../../../components/icon'; -import { autoPlayGif, displayMedia } from 'gabsocial/initial_state'; import classNames from 'classnames'; import { decode } from 'blurhash'; -import { isIOS } from 'gabsocial/utils/is_mobile'; +import Icon from '../../../../components/icon'; +import { autoPlayGif, displayMedia } from '../../../../initial_state'; +import { isIOS } from '../../../../utils/is_mobile'; import './media_item.scss'; - export default class MediaItem extends ImmutablePureComponent { static propTypes = { diff --git a/app/javascript/gabsocial/features/compose/components/search_results/search_results.js b/app/javascript/gabsocial/features/compose/components/search_results/search_results.js index 7ebb2839..1ae0d1fa 100644 --- a/app/javascript/gabsocial/features/compose/components/search_results/search_results.js +++ b/app/javascript/gabsocial/features/compose/components/search_results/search_results.js @@ -1,18 +1,16 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import { FormattedMessage } from 'react-intl'; import TrendingItem from '../../../../components/trending_item'; import Icon from '../../../../components/icon'; import { WhoToFollowPanel } from '../../../../components/panel'; // import TrendsPanel from '../../ui/components/trends_panel'; import GroupListItem from '../../../../components/group_list_item'; -export default -@injectIntl -class SearchResults extends ImmutablePureComponent { +export default class SearchResults extends ImmutablePureComponent { static propTypes = { results: ImmutablePropTypes.map.isRequired, - intl: PropTypes.object.isRequired, location: PropTypes.object, }; diff --git a/app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js b/app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js index 1d09f306..a007df6f 100644 --- a/app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js +++ b/app/javascript/gabsocial/features/compose/containers/sensitive_button_container.js @@ -1,6 +1,6 @@ import classNames from 'classnames'; -import { changeComposeSensitivity } from 'gabsocial/actions/compose'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; +import { changeComposeSensitivity } from '../../../actions/compose'; const messages = defineMessages({ marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' }, diff --git a/app/javascript/gabsocial/features/following/following.js b/app/javascript/gabsocial/features/following/following.js index d732ac1e..1e595b63 100644 --- a/app/javascript/gabsocial/features/following/following.js +++ b/app/javascript/gabsocial/features/following/following.js @@ -1,18 +1,18 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { debounce } from 'lodash'; -import ColumnIndicator from '../../components/column_indicator'; +import { FormattedMessage } from 'react-intl'; +import { me } from '../../initial_state'; import { fetchAccount, fetchFollowing, expandFollowing, fetchAccountByUsername, } from '../../actions/accounts'; -import { FormattedMessage } from 'react-intl'; import AccountContainer from '../../containers/account_container'; +import ColumnIndicator from '../../components/column_indicator'; import Column from '../../components/column'; import ScrollableList from '../../components/scrollable_list'; -import { me } from 'gabsocial/initial_state'; const mapStateToProps = (state, { params: { username } }) => { const accounts = state.getIn(['accounts']); diff --git a/app/javascript/gabsocial/features/groups/index/index.js b/app/javascript/gabsocial/features/groups/index/index.js index 21757785..59a21c88 100644 --- a/app/javascript/gabsocial/features/groups/index/index.js +++ b/app/javascript/gabsocial/features/groups/index/index.js @@ -1,13 +1,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; -import { fetchGroups } from '../../../actions/groups'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { Link } from 'react-router-dom'; import classNames from 'classnames'; +import { fetchGroups } from '../../../actions/groups'; +import { openModal } from '../../../actions/modal'; +import { me } from '../../../initial_state'; import GroupCard from './card'; import GroupCreate from '../create'; -import { me } from 'gabsocial/initial_state'; -import { openModal } from '../../../actions/modal'; const messages = defineMessages({ heading: { id: 'column.groups', defaultMessage: 'Groups' }, diff --git a/app/javascript/gabsocial/features/groups/sidebar_panel/index.js b/app/javascript/gabsocial/features/groups/sidebar_panel/index.js index 86c85acb..d31dcb0e 100644 --- a/app/javascript/gabsocial/features/groups/sidebar_panel/index.js +++ b/app/javascript/gabsocial/features/groups/sidebar_panel/index.js @@ -1,9 +1,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl } from 'react-intl'; -import Item from './item'; -import Icon from 'gabsocial/components/icon'; import { Link } from 'react-router-dom'; +import Item from './item'; +import Icon from '../../../components/icon'; const messages = defineMessages({ title: { id: 'groups.sidebar-panel.title', defaultMessage: 'Groups You\'re In' }, diff --git a/app/javascript/gabsocial/features/groups/timeline/components/header.js b/app/javascript/gabsocial/features/groups/timeline/components/header.js index 1b13097c..488c10df 100644 --- a/app/javascript/gabsocial/features/groups/timeline/components/header.js +++ b/app/javascript/gabsocial/features/groups/timeline/components/header.js @@ -1,9 +1,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; -import Button from 'gabsocial/components/button'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl } from 'react-intl'; import { NavLink } from 'react-router-dom'; import DropdownMenuContainer from '../../../../containers/dropdown_menu_container'; +import Button from '../../../../components/button'; const messages = defineMessages({ join: { id: 'groups.join', defaultMessage: 'Join group' }, diff --git a/app/javascript/gabsocial/features/standalone/hashtag_timeline/hashtag_timeline.js b/app/javascript/gabsocial/features/standalone/hashtag_timeline/hashtag_timeline.js index d5e2b815..402a4cf0 100644 --- a/app/javascript/gabsocial/features/standalone/hashtag_timeline/hashtag_timeline.js +++ b/app/javascript/gabsocial/features/standalone/hashtag_timeline/hashtag_timeline.js @@ -1,10 +1,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { expandHashtagTimeline } from 'gabsocial/actions/timelines'; import Masonry from 'react-masonry-infinite'; import { List as ImmutableList } from 'immutable'; -import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container'; import { debounce } from 'lodash'; +import { expandHashtagTimeline } from '../../../actions/timelines'; +import DetailedStatusContainer from '../../../features/status/containers/detailed_status_container'; import ColumnIndicator from '../../../components/column_indicator'; const mapStateToProps = (state, { hashtag }) => ({ diff --git a/app/javascript/gabsocial/features/standalone/public_timeline/public_timeline.js b/app/javascript/gabsocial/features/standalone/public_timeline/public_timeline.js index bcd63048..e79dd3a5 100644 --- a/app/javascript/gabsocial/features/standalone/public_timeline/public_timeline.js +++ b/app/javascript/gabsocial/features/standalone/public_timeline/public_timeline.js @@ -1,10 +1,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { expandPublicTimeline, expandCommunityTimeline } from 'gabsocial/actions/timelines'; import Masonry from 'react-masonry-infinite'; import { List as ImmutableList, Map as ImmutableMap } from 'immutable'; -import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container'; import { debounce } from 'lodash'; +import { expandPublicTimeline, expandCommunityTimeline } from '../../../actions/timelines'; +import DetailedStatusContainer from '../../../features/status/containers/detailed_status_container'; import ColumnIndicator from '../../../components/column_indicator'; const mapStateToProps = (state, { local }) => { diff --git a/app/javascript/gabsocial/features/ui/components/status_revision_modal.js b/app/javascript/gabsocial/features/ui/components/status_revision_modal.js index 3affbff6..137381e2 100644 --- a/app/javascript/gabsocial/features/ui/components/status_revision_modal.js +++ b/app/javascript/gabsocial/features/ui/components/status_revision_modal.js @@ -2,8 +2,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import IconButton from 'gabsocial/components/icon_button'; import StatusRevisionListContainer from '../containers/status_revision_list_container'; +import IconButton from '../../../components/icon_button'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' },