Updated paths
This commit is contained in:
parent
2bd01457a6
commit
c0f0d4f07a
@ -4,9 +4,9 @@ import { NavLink, withRouter } from 'react-router-dom';
|
|||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import { me } from '../../initial_state';
|
import { me } from '../../initial_state';
|
||||||
import NotificationsCounter from '../notification_counter';
|
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 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 { openModal } from '../../actions/modal';
|
||||||
import GabLogo from './assets/gab_logo/gab_logo';
|
import GabLogo from './assets/gab_logo/gab_logo';
|
||||||
import {
|
import {
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
import { Fragment } from 'react';
|
import { Fragment } from 'react';
|
||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
|
import { List as ImmutableList, fromJS } from 'immutable';
|
||||||
import { IntlProvider, addLocaleData } from 'react-intl';
|
import { IntlProvider, addLocaleData } from 'react-intl';
|
||||||
import { getLocale } from '../locales';
|
import { getLocale } from '../locales';
|
||||||
import MediaGallery from '../components/media_gallery';
|
|
||||||
import Video from '../features/video';
|
import Video from '../features/video';
|
||||||
import Card from '../features/status/components/card';
|
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 ModalRoot from '../components/modal_root';
|
||||||
import { MediaModal } from '../components/modal';
|
import { MediaModal } from '../components/modal';
|
||||||
import { List as ImmutableList, fromJS } from 'immutable';
|
|
||||||
|
|
||||||
const { localeData, messages } = getLocale();
|
const { localeData, messages } = getLocale();
|
||||||
addLocaleData(localeData);
|
addLocaleData(localeData);
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||||
import { createSelector } from 'reselect';
|
import { createSelector } from 'reselect';
|
||||||
import { debounce } from 'lodash';
|
import { debounce, sample } from 'lodash';
|
||||||
import { me, promotions } from '../initial_state';
|
import { me, promotions } from '../initial_state';
|
||||||
import { dequeueTimeline } from 'gabsocial/actions/timelines';
|
import { dequeueTimeline } from '../actions/timelines';
|
||||||
import { scrollTopTimeline } from '../actions/timelines';
|
import { scrollTopTimeline } from '../actions/timelines';
|
||||||
import { sample } from 'lodash';
|
|
||||||
import { fetchStatus } from '../actions/statuses';
|
import { fetchStatus } from '../actions/statuses';
|
||||||
import StatusList from '../components/status_list';
|
import StatusList from '../components/status_list';
|
||||||
|
|
||||||
|
@ -1,14 +1,13 @@
|
|||||||
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 Icon from '../../../../components/icon';
|
|
||||||
import { autoPlayGif, displayMedia } from 'gabsocial/initial_state';
|
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { decode } from 'blurhash';
|
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';
|
import './media_item.scss';
|
||||||
|
|
||||||
|
|
||||||
export default class MediaItem extends ImmutablePureComponent {
|
export default class MediaItem extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
|
@ -1,18 +1,16 @@
|
|||||||
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 { FormattedMessage } from 'react-intl';
|
||||||
import TrendingItem from '../../../../components/trending_item';
|
import TrendingItem from '../../../../components/trending_item';
|
||||||
import Icon from '../../../../components/icon';
|
import Icon from '../../../../components/icon';
|
||||||
import { WhoToFollowPanel } from '../../../../components/panel';
|
import { WhoToFollowPanel } from '../../../../components/panel';
|
||||||
// import TrendsPanel from '../../ui/components/trends_panel';
|
// import TrendsPanel from '../../ui/components/trends_panel';
|
||||||
import GroupListItem from '../../../../components/group_list_item';
|
import GroupListItem from '../../../../components/group_list_item';
|
||||||
|
|
||||||
export default
|
export default class SearchResults extends ImmutablePureComponent {
|
||||||
@injectIntl
|
|
||||||
class SearchResults extends ImmutablePureComponent {
|
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
results: ImmutablePropTypes.map.isRequired,
|
results: ImmutablePropTypes.map.isRequired,
|
||||||
intl: PropTypes.object.isRequired,
|
|
||||||
location: PropTypes.object,
|
location: PropTypes.object,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { changeComposeSensitivity } from 'gabsocial/actions/compose';
|
|
||||||
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
|
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
|
||||||
|
import { changeComposeSensitivity } from '../../../actions/compose';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' },
|
marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' },
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
import ColumnIndicator from '../../components/column_indicator';
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
import { me } from '../../initial_state';
|
||||||
import {
|
import {
|
||||||
fetchAccount,
|
fetchAccount,
|
||||||
fetchFollowing,
|
fetchFollowing,
|
||||||
expandFollowing,
|
expandFollowing,
|
||||||
fetchAccountByUsername,
|
fetchAccountByUsername,
|
||||||
} from '../../actions/accounts';
|
} from '../../actions/accounts';
|
||||||
import { FormattedMessage } from 'react-intl';
|
|
||||||
import AccountContainer from '../../containers/account_container';
|
import AccountContainer from '../../containers/account_container';
|
||||||
|
import ColumnIndicator from '../../components/column_indicator';
|
||||||
import Column from '../../components/column';
|
import Column from '../../components/column';
|
||||||
import ScrollableList from '../../components/scrollable_list';
|
import ScrollableList from '../../components/scrollable_list';
|
||||||
import { me } from 'gabsocial/initial_state';
|
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { username } }) => {
|
const mapStateToProps = (state, { params: { username } }) => {
|
||||||
const accounts = state.getIn(['accounts']);
|
const accounts = state.getIn(['accounts']);
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import { fetchGroups } from '../../../actions/groups';
|
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
import { fetchGroups } from '../../../actions/groups';
|
||||||
|
import { openModal } from '../../../actions/modal';
|
||||||
|
import { me } from '../../../initial_state';
|
||||||
import GroupCard from './card';
|
import GroupCard from './card';
|
||||||
import GroupCreate from '../create';
|
import GroupCreate from '../create';
|
||||||
import { me } from 'gabsocial/initial_state';
|
|
||||||
import { openModal } from '../../../actions/modal';
|
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
heading: { id: 'column.groups', defaultMessage: 'Groups' },
|
heading: { id: 'column.groups', defaultMessage: 'Groups' },
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
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 { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
import Item from './item';
|
|
||||||
import Icon from 'gabsocial/components/icon';
|
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
|
import Item from './item';
|
||||||
|
import Icon from '../../../components/icon';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
title: { id: 'groups.sidebar-panel.title', defaultMessage: 'Groups You\'re In' },
|
title: { id: 'groups.sidebar-panel.title', defaultMessage: 'Groups You\'re In' },
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import Button from 'gabsocial/components/button';
|
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
import { NavLink } from 'react-router-dom';
|
import { NavLink } from 'react-router-dom';
|
||||||
import DropdownMenuContainer from '../../../../containers/dropdown_menu_container';
|
import DropdownMenuContainer from '../../../../containers/dropdown_menu_container';
|
||||||
|
import Button from '../../../../components/button';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
join: { id: 'groups.join', defaultMessage: 'Join group' },
|
join: { id: 'groups.join', defaultMessage: 'Join group' },
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
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 { expandHashtagTimeline } from 'gabsocial/actions/timelines';
|
|
||||||
import Masonry from 'react-masonry-infinite';
|
import Masonry from 'react-masonry-infinite';
|
||||||
import { List as ImmutableList } from 'immutable';
|
import { List as ImmutableList } from 'immutable';
|
||||||
import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container';
|
|
||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
|
import { expandHashtagTimeline } from '../../../actions/timelines';
|
||||||
|
import DetailedStatusContainer from '../../../features/status/containers/detailed_status_container';
|
||||||
import ColumnIndicator from '../../../components/column_indicator';
|
import ColumnIndicator from '../../../components/column_indicator';
|
||||||
|
|
||||||
const mapStateToProps = (state, { hashtag }) => ({
|
const mapStateToProps = (state, { hashtag }) => ({
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
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 { expandPublicTimeline, expandCommunityTimeline } from 'gabsocial/actions/timelines';
|
|
||||||
import Masonry from 'react-masonry-infinite';
|
import Masonry from 'react-masonry-infinite';
|
||||||
import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
|
import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
|
||||||
import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container';
|
|
||||||
import { debounce } from 'lodash';
|
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';
|
import ColumnIndicator from '../../../components/column_indicator';
|
||||||
|
|
||||||
const mapStateToProps = (state, { local }) => {
|
const mapStateToProps = (state, { local }) => {
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
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 IconButton from 'gabsocial/components/icon_button';
|
|
||||||
import StatusRevisionListContainer from '../containers/status_revision_list_container';
|
import StatusRevisionListContainer from '../containers/status_revision_list_container';
|
||||||
|
import IconButton from '../../../components/icon_button';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
close: { id: 'lightbox.close', defaultMessage: 'Close' },
|
close: { id: 'lightbox.close', defaultMessage: 'Close' },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user