...
 
Commits (2)
...@@ -33,7 +33,7 @@ export default getState => axios.create({ ...@@ -33,7 +33,7 @@ export default getState => axios.create({
transformResponse: [function (data) { transformResponse: [function (data) {
try { try {
return JSON.parse(data); return JSON.parse(data);
} catch(Exception) { } catch (Exception) {
return data; return data;
} }
}], }],
......
...@@ -3,10 +3,10 @@ import { Link } from 'react-router-dom'; ...@@ -3,10 +3,10 @@ import { Link } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
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 { me } from '../../initial_state';
import Avatar from '../avatar/avatar'; import Avatar from '../avatar/avatar';
import DisplayName from '../display_name'; import DisplayName from '../display_name';
import IconButton from '../icon_button'; import IconButton from '../icon_button';
import { me } from '../../initial_state';
import './account.scss'; import './account.scss';
......
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 { makeGetAccount } from '../../selectors';
import Avatar from '../avatar'; import Avatar from '../avatar';
import DisplayName from '../display_name'; import DisplayName from '../display_name';
import { makeGetAccount } from '../../selectors';
import './autosuggest_account.scss'; import './autosuggest_account.scss';
......
...@@ -2,10 +2,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -2,10 +2,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import classNames from 'classnames'; import classNames from 'classnames';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import Textarea from 'react-textarea-autosize'; import Textarea from 'react-textarea-autosize';
import AutosuggestAccount from '../autosuggest_account';
import AutosuggestEmoji from '../autosuggest_emoji';
import { isRtl } from '../../utils/rtl'; import { isRtl } from '../../utils/rtl';
import { textAtCursorMatchesToken } from '../../utils/cursor_token_match'; import { textAtCursorMatchesToken } from '../../utils/cursor_token_match';
import AutosuggestAccount from '../autosuggest_account';
import AutosuggestEmoji from '../autosuggest_emoji';
import './autosuggest_textbox.scss'; import './autosuggest_textbox.scss';
......
import ColumnHeader from '../column_header';
import { isMobile } from '../../utils/is_mobile'; import { isMobile } from '../../utils/is_mobile';
import { ColumnHeader } from '../column_header';
import ColumnBackButton from '../column_back_button'; import ColumnBackButton from '../column_back_button';
import './column.scss'; import './column.scss';
...@@ -23,9 +23,9 @@ export default class Column extends PureComponent { ...@@ -23,9 +23,9 @@ export default class Column extends PureComponent {
const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth))); const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth)));
const columnHeaderId = showHeading && heading.replace(/ /g, '-'); const columnHeaderId = showHeading && heading.replace(/ /g, '-');
// const header = showHeading && ( const header = showHeading && (
// <ColumnHeader icon={icon} active={active} type={heading} columnHeaderId={columnHeaderId} /> <ColumnHeader icon={icon} active={active} type={heading} columnHeaderId={columnHeaderId} />
// ); );
return ( return (
<div role='region' aria-labelledby={columnHeaderId} className='column'> <div role='region' aria-labelledby={columnHeaderId} className='column'>
......
...@@ -4,8 +4,8 @@ import classNames from 'classnames'; ...@@ -4,8 +4,8 @@ import classNames from 'classnames';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import Icon from '../icon';
import { fetchLists } from '../../actions/lists'; import { fetchLists } from '../../actions/lists';
import Icon from '../icon';
import './column_header.scss'; import './column_header.scss';
......
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 VerifiedIcon from '../verified_icon/verified_icon'; import VerifiedIcon from '../verified_icon';
import './display_name.scss'; import './display_name.scss';
......
import IconButton from '../icon_button';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import IconButton from '../icon_button';
import './domain.scss'; import './domain.scss';
......
...@@ -3,8 +3,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; ...@@ -3,8 +3,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import detectPassiveEvents from 'detect-passive-events'; import detectPassiveEvents from 'detect-passive-events';
import Overlay from 'react-overlays/lib/Overlay'; import Overlay from 'react-overlays/lib/Overlay';
import spring from 'react-motion/lib/spring'; import spring from 'react-motion/lib/spring';
import IconButton from '../icon_button';
import Motion from '../../features/ui/util/optional_motion'; import Motion from '../../features/ui/util/optional_motion';
import IconButton from '../icon_button';
import './dropdown_menu.scss'; import './dropdown_menu.scss';
......
import { NavLink, withRouter } from 'react-router-dom'; import { NavLink, withRouter } from 'react-router-dom';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import NotificationCounter from '../../../components/notification_counter'; import NotificationCounter from '../notification_counter';
import { me } from '../../../initial_state'; import { me } from '../../initial_state';
import './footer_bar.scss';
const links = [ const links = [
<NavLink key='pr1' className='footer-bar__link' to='/home' data-preview-title-id='column.home'> <NavLink key='pr1' className='footer-bar__link' to='/home' data-preview-title-id='column.home'>
......
.footer-bar {
display: block;
position: fixed;
background: #000;
height: 58px;
bottom: 0;
left: 0;
right: 0;
z-index: 1000;
transition: transform 0.2s ease;
overflow: hidden;
padding-bottom: 0;
padding-bottom: env(safe-area-inset-bottom);
@media screen and (min-width: 895px) {
display: none !important;
}
&__container {
display: flex;
flex-direction: row;
align-items: stretch;
}
&__link {
display: flex;
flex: 1 1 auto;
margin: 0;
min-width: 36px;
height: 58px;
padding-top: 4px;
justify-content: center;
color: white;
text-decoration: none;
border-top: 2px solid transparent;
&.active {
border-top-color: $gab-brand-default;
}
& > span {
display: none;
}
}
}
\ No newline at end of file
export { default } from './footer_bar';
\ No newline at end of file
...@@ -2,7 +2,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -2,7 +2,7 @@ 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 { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { shortNumberFormat } from '../utils/numbers'; import { shortNumberFormat } from '../../utils/numbers';
const messages = defineMessages({ const messages = defineMessages({
members: { id: 'groups.card.members', defaultMessage: 'Members' }, members: { id: 'groups.card.members', defaultMessage: 'Members' },
......
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import { invitesEnabled, version, repository, source_url, me } from '../../initial_state';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modal';
import { invitesEnabled, version, repository, source_url, me } from '../../initial_state';
import './link_footer.scss'; import './link_footer.scss';
......
...@@ -4,14 +4,13 @@ import { is } from 'immutable'; ...@@ -4,14 +4,13 @@ import { is } from 'immutable';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames'; import classNames from 'classnames';
import { decode } from 'blurhash'; import { decode } from 'blurhash';
import { autoPlayGif, displayMedia } from '../../initial_state';
import { isIOS } from '../../utils/is_mobile'; import { isIOS } from '../../utils/is_mobile';
import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../../utils/media_aspect_ratio'; import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../../utils/media_aspect_ratio';
import { autoPlayGif, displayMedia } from '../../initial_state';
import IconButton from '../icon_button'; import IconButton from '../icon_button';
import './media_gallery.scss'; import './media_gallery.scss';
const messages = defineMessages({ const messages = defineMessages({
toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' }, toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
warning: { id: 'status.sensitive_warning', defaultMessage: 'Sensitive content' }, warning: { id: 'status.sensitive_warning', defaultMessage: 'Sensitive content' },
......
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import ToggleSwitch from '../../toggle_switch';
import Button from '../../button';
import { closeModal } from '../../../actions/modal'; import { closeModal } from '../../../actions/modal';
import { muteAccount } from '../../../actions/accounts'; import { muteAccount } from '../../../actions/accounts';
import { toggleHideNotifications } from '../../../actions/mutes'; import { toggleHideNotifications } from '../../../actions/mutes';
import ToggleSwitch from '../../toggle_switch';
import Button from '../../button';
const messages = defineMessages({ const messages = defineMessages({
muteMessage: { id: 'confirmations.mute.message', defaultMessage: 'Are you sure you want to mute {name}?' }, muteMessage: { id: 'confirmations.mute.message', defaultMessage: 'Are you sure you want to mute {name}?' },
......
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { me } from '../../../initial_state'; import { me } from '../initial_state';
import IconButton from '../../../components/icon_button'; import IconButton from './icon_button';
import Icon from '../../../components/icon'; import Icon from './icon';
const messages = defineMessages({ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' }, close: { id: 'lightbox.close', defaultMessage: 'Close' },
......
...@@ -2,11 +2,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -2,11 +2,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import { OrderedSet } from 'immutable'; import { OrderedSet } from 'immutable';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import ToggleSwitch from '../../toggle_switch';
import { changeReportComment, changeReportForward, submitReport } from '../../../actions/reports'; import { changeReportComment, changeReportForward, submitReport } from '../../../actions/reports';
import { expandAccountTimeline } from '../../../actions/timelines'; import { expandAccountTimeline } from '../../../actions/timelines';
import { makeGetAccount } from '../../../selectors'; import { makeGetAccount } from '../../../selectors';
import StatusCheckBox from '../../status_check_box'; import StatusCheckBox from '../../status_check_box';
import ToggleSwitch from '../../toggle_switch';
import Button from '../../button'; import Button from '../../button';
import IconButton from '../../icon_button'; import IconButton from '../../icon_button';
......
...@@ -2,8 +2,8 @@ ...@@ -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' },
......
...@@ -12,9 +12,6 @@ import { ...@@ -12,9 +12,6 @@ import {
ComposeModal, ComposeModal,
UnauthorizedModal, UnauthorizedModal,
} from '../modal'; } from '../modal';
import ModalLoading from '../modal_loading';
import { import {
MuteModal, MuteModal,
ReportModal, ReportModal,
...@@ -23,6 +20,7 @@ import { ...@@ -23,6 +20,7 @@ import {
ListAdder, ListAdder,
StatusRevisionModal, StatusRevisionModal,
} from '../../features/ui/util/async-components'; } from '../../features/ui/util/async-components';
import ModalLoading from '../modal_loading';
const MODAL_COMPONENTS = { const MODAL_COMPONENTS = {
'MEDIA': () => Promise.resolve({ default: MediaModal }), 'MEDIA': () => Promise.resolve({ default: MediaModal }),
......
...@@ -7,7 +7,7 @@ import spring from 'react-motion/lib/spring'; ...@@ -7,7 +7,7 @@ import spring from 'react-motion/lib/spring';
import Motion from '../../features/ui/util/optional_motion'; import Motion from '../../features/ui/util/optional_motion';
import { vote, fetchPoll } from '../../actions/polls'; import { vote, fetchPoll } from '../../actions/polls';
import emojify from '../emoji/emoji'; import emojify from '../emoji/emoji';
import RelativeTimestamp from '../relative_timestamp/relative_timestamp'; import RelativeTimestamp from '../relative_timestamp';
import Button from '../button'; import Button from '../button';
import './poll.scss'; import './poll.scss';
......
export { default } from './progress_panel';
\ No newline at end of file
import { monthlyExpensesComplete } from '../../../initial_state'; import { monthlyExpensesComplete } from '../../initial_state';
export default class ProgressPanel extends React.PureComponent { export default class ProgressPanel extends React.PureComponent {
render() { render() {
......
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { List as ImmutableList } from 'immutable'; import { List as ImmutableList } from 'immutable';
import ColumnIndicator from '../column_indicator';
import IntersectionObserverArticleContainer from '../../containers/intersection_observer_article_container'; import IntersectionObserverArticleContainer from '../../containers/intersection_observer_article_container';
import LoadMore from '../load_more';
import IntersectionObserverWrapper from '../../features/ui/util/intersection_observer_wrapper'; import IntersectionObserverWrapper from '../../features/ui/util/intersection_observer_wrapper';
import ColumnIndicator from '../column_indicator';
import LoadMore from '../load_more';
import './scrollable_list.scss'; import './scrollable_list.scss';
......
export { default } from './sidebar_menu';
\ No newline at end of file
...@@ -3,15 +3,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -3,15 +3,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import classNames from 'classnames'; import classNames from 'classnames';
import Avatar from './avatar'; import Avatar from '../avatar';
import IconButton from './icon_button'; import IconButton from '../icon_button';
import Icon from './icon'; import Icon from '../icon';
import DisplayName from './display_name'; import DisplayName from '../display_name';
import { closeSidebar } from '../actions/sidebar'; import { closeSidebar } from '../../actions/sidebar';
import { shortNumberFormat } from '../utils/numbers'; import { shortNumberFormat } from '../../utils/numbers';
import { me } from '../initial_state'; import { me } from '../../initial_state';
import { makeGetAccount } from '../selectors'; import { makeGetAccount } from '../../selectors';
import ProgressPanel from '../features/ui/components/progress_panel'; import ProgressPanel from '../progress_panel';
import './sidebar_menu.scss';
const messages = defineMessages({ const messages = defineMessages({
followers: { id: 'account.followers', defaultMessage: 'Followers' }, followers: { id: 'account.followers', defaultMessage: 'Followers' },
......
.sidebar-menu {
display: flex;
position: fixed;
flex-direction: column;
width: 275px;
height: 100vh;
top: 0;
bottom: 0;
left: 0;
background: $gab-background-container;
transform: translateX(-275px);
transition: all 0.15s linear;
z-index: 10001;
body.theme-gabsocial-light & {
background: $gab-background-container-light;
}
&__root {
display: none;
}
&__wrapper {
display: block;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 10000;
background-color: transparent;
transition: background-color 0.2s linear;
transition-delay: 0.1s;
}
&__content {
display: flex;
flex: 1 1;
flex-direction: column;
padding-bottom: 40px;
overflow: hidden;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
}
&__section {
display: block;
margin: 4px 0;
border-top: 1px solid lighten($ui-base-color, 4%);
&--borderless {
margin: 0;
border-top: none;
}
}
@media (max-width: 400px) {
width: 90vw;
}
}
.sidebar-menu__root--visible {
display: block;
.sidebar-menu {
transform: translateX(0);
}
.sidebar-menu__wrapper {
background-color: rgba(0,0,0,0.3);
}
}
.sidebar-menu-header {
display: flex;
height: 46px;
padding: 12px 14px;
border-bottom: 1px solid lighten($ui-base-color, 4%);
box-sizing: border-box;
align-items: center;
&__title {
display: block;
font-size: 18px;
font-weight: 600;
color: $primary-text-color;
}
&__btn {
margin-left: auto;
}
}
.sidebar-menu-profile {
display: block;
padding: 14px 18px;
&__avatar {
display: block;
width: 56px;
height: 56px;
}
&__name {
display: block;
margin-top: 10px;
.display-name__account {
display: block;
margin-top: 2px;
}
}
&__stats {
display: flex;
margin-top: 12px;
}
}
.sidebar-menu-profile-stat {
display: flex;
font-size: 14px;
text-decoration: none;
&:not(:first-of-type) {
margin-left: 18px;
}
&__value {
display: flex;
margin-right: 3px;
font-weight: 700;
color: $primary-text-color;
}
&__label {
display: flex;
color: $primary-text-color;
}
&:hover {
text-decoration: underline;
}
}
.sidebar-menu-item {
display: flex;
padding: 16px 18px;
cursor: pointer;
text-decoration: none;
color: $primary-text-color;
font-size: 15px;
font-weight: 400;
height: 50px;
box-sizing: border-box;
&:hover {
background-color: rgba($gab-brand-default, 0.1);
.fa {
color: $primary-text-color;
}
}
.fa {
margin-right: 10px;
}
&:hover {
&__title {
color: $primary-text-color;
}
}
}
\ No newline at end of file
...@@ -5,18 +5,18 @@ import { injectIntl, FormattedMessage } from 'react-intl'; ...@@ -5,18 +5,18 @@ import { injectIntl, FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys'; import { HotKeys } from 'react-hotkeys';
import classNames from 'classnames'; import classNames from 'classnames';
import { displayMedia } from '../../initial_state';
import Card from '../../features/status/components/card';
import { MediaGallery, Video } from '../../features/ui/util/async-components';
import Avatar from '../avatar'; import Avatar from '../avatar';
import StatusQuote from '../status_quote'; import StatusQuote from '../status_quote';
import AvatarOverlay from '../avatar_overlay'; import AvatarOverlay from '../avatar_overlay';
import RelativeTimestamp from '../relative_timestamp'; import RelativeTimestamp from '../relative_timestamp';
import DisplayName from '../display_name'; import DisplayName from '../display_name';
import Icon from '../icon';
import Poll from '../poll';
import StatusContent from '../status_content'; import StatusContent from '../status_content';
import StatusActionBar from '../status_action_bar'; import StatusActionBar from '../status_action_bar';
import Card from '../../features/status/components/card'; import Icon from '../icon';
import { MediaGallery, Video } from '../../features/ui/util/async-components'; import Poll from '../poll';
import { displayMedia } from '../../initial_state';
import './status.scss'; import './status.scss';
...@@ -483,9 +483,9 @@ class Status extends ImmutablePureComponent { ...@@ -483,9 +483,9 @@ class Status extends ImmutablePureComponent {
{media} {media}
{status.get('quote') && <StatusQuote { /* status.get('quote') && <StatusQuote
id={status.get('quote')} id={status.get('quote')}
/>} /> */ }
{showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && ( {showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && (
<button className='status__content__read-more-button' onClick={this.handleClick}> <button className='status__content__read-more-button' onClick={this.handleClick}>
......
...@@ -3,10 +3,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -3,10 +3,10 @@ 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 { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { openModal } from '../../actions/modal';
import { me, isStaff } from '../../initial_state';
import DropdownMenuContainer from '../../containers/dropdown_menu_container'; import DropdownMenuContainer from '../../containers/dropdown_menu_container';
import IconButton from '../icon_button'; import IconButton from '../icon_button';
import { me, isStaff } from '../../initial_state';
import { openModal } from '../../actions/modal';
import './status_action_bar.scss'; import './status_action_bar.scss';
......
...@@ -2,10 +2,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -2,10 +2,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { Set as ImmutableSet } from 'immutable'; import { Set as ImmutableSet } from 'immutable';
import noop from 'lodash/noop'; import noop from 'lodash/noop';
import StatusContent from '../status_content'; import { toggleStatusReport } from '../../actions/reports';
import { MediaGallery, Video } from '../../features/ui/util/async-components'; import { MediaGallery, Video } from '../../features/ui/util/async-components';
import Bundle from '../../features/ui/util/bundle'; import Bundle from '../../features/ui/util/bundle';
import { toggleStatusReport } from '../../actions/reports'; import StatusContent from '../status_content';
import ToggleSwitch from '../toggle_switch'; import ToggleSwitch from '../toggle_switch';
import './status_check_box.scss'; import './status_check_box.scss';
......
...@@ -2,11 +2,10 @@ import { Fragment } from 'react'; ...@@ -2,11 +2,10 @@ import { Fragment } from 'react';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
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 LoadMore from '../load_more'; import StatusContainer from '../../containers/status_container';
import ScrollableList from '../scrollable_list'; import ScrollableList from '../scrollable_list';
import TimelineQueueButtonHeader from '../timeline_queue_button_header'; import TimelineQueueButtonHeader from '../timeline_queue_button_header';
import ColumnIndicator from '../column_indicator'; import ColumnIndicator from '../column_indicator';
import StatusContainer from '../../containers/status_container';
export default class StatusList extends ImmutablePureComponent { export default class StatusList extends ImmutablePureComponent {
......
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import StatusContent from './status_content'; import StatusContent from '../status_content';
import DisplayName from './display_name'; import DisplayName from '../display_name';
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import './status_quote.scss';
const mapStateToProps = (state, { id }) => ({ const mapStateToProps = (state, { id }) => ({
status: state.getIn(['statuses', id]), status: state.getIn(['statuses', id]),
account: state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]), account: state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
......
import { injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ModalLoading from './modal_loading';
import RelativeTimestamp from './relative_timestamp';
export default @injectIntl
class StatusRevisionsList extends ImmutablePureComponent {
static propTypes = {
loading: PropTypes.bool.isRequired,
error: PropTypes.object,
data: PropTypes.array
};
render() {
const { loading, error, data } = this.props;
if (loading || !data) return <ModalLoading />;
if (error) return (
<div className='status-revisions-list'>
<div className='status-revisions-list__error'>An error occured</div>
</div>
);
return (
<div className='status-revisions-list'>
{data.map((revision, i) => (
<div key={i} className='status-revisions-list__item'>
<div className='status-revisions-list__item__timestamp'>
<RelativeTimestamp timestamp={revision.created_at} />
</div>
<div className='status-revisions-list__item__text'>{revision.text}</div>
</div>
))}
</div>
);
}
}
\ No newline at end of file
...@@ -2,12 +2,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; ...@@ -2,12 +2,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { NavLink, withRouter } from 'react-router-dom'; import { NavLink, withRouter } from 'react-router-dom';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { openModal } from '../../actions/modal';
import { me } from '../../initial_state'; import { me } from '../../initial_state';
import NotificationsCounter from '../notification_counter'; import SearchContainer from '../../features/compose/containers/search_container';
import SearchContainer from 'gabsocial/features/compose/containers/search_container'; import ActionBar from '../../features/compose/components/action_bar';
import Avatar from '../avatar'; import Avatar from '../avatar';
import ActionBar from 'gabsocial/features/compose/components/action_bar'; import NotificationsCounter from '../notification_counter';
import { openModal } from '../../actions/modal';
import GabLogo from './assets/gab_logo/gab_logo'; import GabLogo from './assets/gab_logo/gab_logo';
import { import {
GroupIcon, GroupIcon,
......
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 Avatar from '../avatar';
import ComposeFormContainer from '../../features/compose/containers/compose_form_container';
import { me } from '../../initial_state'; import { me } from '../../initial_state';
import ComposeFormContainer from '../../features/compose/containers/compose_form_container';
import Avatar from '../avatar';
import './timeline_compose_block.scss'; import './timeline_compose_block.scss';
......
...@@ -2,8 +2,8 @@ import { Sparklines, SparklinesCurve } from 'react-sparklines'; ...@@ -2,8 +2,8 @@ import { Sparklines, SparklinesCurve } from 'react-sparklines';
import { FormattedMessage } from 'react-intl'; import { 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 Permalink from '../permalink/permalink';
import { shortNumberFormat } from '../../utils/numbers'; import { shortNumberFormat } from '../../utils/numbers';
import Permalink from '../permalink';
import './trending_item.scss'; import './trending_item.scss';
......
import Motion from '../../features/ui/util/optional_motion';
import spring from 'react-motion/lib/spring';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import spring from 'react-motion/lib/spring';
import Motion from '../../features/ui/util/optional_motion';
import './upload_area.scss'; import './upload_area.scss';
......
...@@ -4,8 +4,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -4,8 +4,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { autoPlayGif, me } from '../../initial_state'; import { autoPlayGif, me } from '../../initial_state';
import { makeGetAccount } from '../../selectors'; import { makeGetAccount } from '../../selectors';
import Avatar from '../avatar';
import { shortNumberFormat } from '../../utils/numbers'; import { shortNumberFormat } from '../../utils/numbers';
import Avatar from '../avatar';
import './user_panel.scss'; import './user_panel.scss';
......
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { makeGetAccount } from '../selectors';
import Account from '../components/account';
import { import {
followAccount, followAccount,
unfollowAccount, unfollowAccount,
...@@ -12,6 +10,8 @@ import { ...@@ -12,6 +10,8 @@ import {
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modal';
import { initMuteModal } from '../actions/mutes'; import { initMuteModal } from '../actions/mutes';
import { unfollowModal } from '../initial_state'; import { unfollowModal } from '../initial_state';
import { makeGetAccount } from '../selectors';
import Account from '../components/account';
const messages = defineMessages({ const messages = defineMessages({
unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
......
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales';
import configureStore from '../store/configureStore'; import configureStore from '../store/configureStore';
import { hydrateStore } from '../actions/store'; import { hydrateStore } from '../actions/store';
import { getLocale } from '../locales';
import Compose from '../features/standalone/compose';
import initialState from '../initial_state';
import { fetchCustomEmojis } from '../actions/custom_emojis'; import { fetchCustomEmojis } from '../actions/custom_emojis';
import initialState from '../initial_state';
import Compose from '../features/standalone/compose';
const { localeData, messages } = getLocale(); const { localeData, messages } = getLocale();
addLocaleData(localeData); addLocaleData(localeData);
......
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { blockDomain, unblockDomain } from '../actions/domain_blocks'; import { blockDomain, unblockDomain } from '../actions/domain_blocks';
import Domain from '../components/domain';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modal';
import Domain from '../components/domain';
const messages = defineMessages({ const messages = defineMessages({
blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
......
import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu'; import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
import { openModal, closeModal } from '../actions/modal'; import { openModal, closeModal } from '../actions/modal';
import DropdownMenu from '../components/dropdown_menu';
import { isUserTouching } from '../utils/is_mobile'; import { isUserTouching } from '../utils/is_mobile';
import DropdownMenu from '../components/dropdown_menu';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isModalOpen: state.get('modal').modalType === 'ACTIONS', isModalOpen: state.get('modal').modalType === 'ACTIONS',
......
...@@ -5,18 +5,18 @@ import configureStore from '../store/configureStore'; ...@@ -5,18 +5,18 @@ import configureStore from '../store/configureStore';
import { INTRODUCTION_VERSION } from '../actions/onboarding'; import { INTRODUCTION_VERSION } from '../actions/onboarding';
import { BrowserRouter, Route } from 'react-router-dom'; import { BrowserRouter, Route } from 'react-router-dom';
import { ScrollContext } from 'react-router-scroll-4'; import { ScrollContext } from 'react-router-scroll-4';
import UI from '../features/ui'; import { IntlProvider, addLocaleData } from 'react-intl';
import Introduction from '../features/introduction';
import { fetchCustomEmojis } from '../actions/custom_emojis'; import { fetchCustomEmojis } from '../actions/custom_emojis';
import { hydrateStore } from '../actions/store'; import { hydrateStore } from '../actions/store';
import { import {
connectUserStream, connectUserStream,
connectStatusUpdateStream, connectStatusUpdateStream,
} from '../actions/streaming'; } from '../actions/streaming';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales'; import { getLocale } from '../locales';
import initialState from '../initial_state'; import initialState from '../initial_state';
import { me } from '../initial_state'; import { me } from '../initial_state';
import UI from '../features/ui';
// import Introduction from '../features/introduction';
import ErrorBoundary from '../components/error_boundary'; import ErrorBoundary from '../components/error_boundary';
const { localeData, messages } = getLocale(); const { localeData, messages } = getLocale();
......
import IntersectionObserverArticle from '../components/intersection_observer_article';
import { setHeight } from '../actions/height_cache'; import { setHeight } from '../actions/height_cache';
import IntersectionObserverArticle from '../components/intersection_observer_article';
const makeMapStateToProps = (state, props) => ({ const makeMapStateToProps = (state, props) => ({
cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]), cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]),
......
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);
......
import Status from '../components/status'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { makeGetStatus } from '../selectors';
import { import {
replyCompose, replyCompose,
mentionCompose, mentionCompose,
...@@ -26,13 +25,14 @@ import { ...@@ -26,13 +25,14 @@ import {
import { initMuteModal } from '../actions/mutes'; import { initMuteModal } from '../actions/mutes';
import { initReport } from '../actions/reports'; import { initReport } from '../actions/reports';
import { openModal } from '../actions/modal'; import { openModal } from '../actions/modal';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { boostModal, deleteModal } from '../initial_state'; import { boostModal, deleteModal } from '../initial_state';
import { showAlertForError } from '../actions/alerts'; import { showAlertForError } from '../actions/alerts';
import { import {
createRemovedAccount, createRemovedAccount,
groupRemoveStatus groupRemoveStatus
} from '../actions/groups'; } from '../actions/groups';
import { makeGetStatus } from '../selectors';
import Status from '../components/status';
const messages = defineMessages({ const messages = defineMessages({
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
......
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 { dequeueTimeline } from '../actions/timelines';
import { dequeueTimeline } from 'gabsocial/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 { me, promotions } from '../initial_state';
import StatusList from '../components/status_list'; import StatusList from '../components/status_list';
const makeGetStatusIds = () => createSelector([ const makeGetStatusIds = () => createSelector([
......
...@@ -2,13 +2,13 @@ import { Fragment } from 'react'; ...@@ -2,13 +2,13 @@ import { Fragment } from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { IntlProvider, addLocaleData } from 'react-intl'; import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales';
import configureStore from '../store/configureStore'; import configureStore from '../store/configureStore';
import { hydrateStore } from '../actions/store'; import { hydrateStore } from '../actions/store';
import { getLocale } from '../locales'; import initialState from '../initial_state';
import PublicTimeline from '../features/standalone/public_timeline'; import PublicTimeline from '../features/standalone/public_timeline';
import HashtagTimeline from '../features/standalone/hashtag_timeline'; import HashtagTimeline from '../features/standalone/hashtag_timeline';
import ModalContainer from './modal_container'; import ModalContainer from './modal_container';
import initialState from '../initial_state';
const { localeData, messages } = getLocale(); const { localeData, messages } = getLocale();
addLocaleData(localeData); addLocaleData(localeData);
......
...@@ -5,14 +5,14 @@ import { ...@@ -5,14 +5,14 @@ import {
fetchAccount, fetchAccount,
fetchAccountByUsername, fetchAccountByUsername,
} from '../../actions/accounts'; } from '../../actions/accounts';
import { openModal } from '../../actions/modal';
import { expandAccountMediaTimeline } from '../../actions/timelines'; import { expandAccountMediaTimeline } from '../../actions/timelines';
import { me } from '../../initial_state';
import { getAccountGallery } from '../../selectors';
import ColumnIndicator from '../../components/column_indicator'; import ColumnIndicator from '../../components/column_indicator';
import Column from '../../components/column'; import Column from '../../components/column';
import { getAccountGallery } from '../../selectors';
import MediaItem from './components/media_item'; import MediaItem from './components/media_item';
import LoadMore from '../../components/load_more'; import LoadMore from '../../components/load_more';
import { openModal } from '../../actions/modal';
import { me } from '../../initial_state';
import SectionHeadlineBar from '../../components/section_headline_bar'; import SectionHeadlineBar from '../../components/section_headline_bar';
import './account_gallery.scss'; import './account_gallery.scss';
......
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 = {
......
...@@ -4,11 +4,11 @@ import { List as ImmutableList } from 'immutable'; ...@@ -4,11 +4,11 @@ import { List as ImmutableList } from 'immutable';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import { fetchAccount, fetchAccountByUsername } from '../../actions/accounts'; import { fetchAccount, fetchAccountByUsername } from '../../actions/accounts';
import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines'; import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines';
import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';
import { me } from '../../initial_state';
import StatusList from '../../components/status_list/status_list'; import StatusList from '../../components/status_list/status_list';
import ColumnIndicator from '../../components/column_indicator/column_indicator'; import ColumnIndicator from '../../components/column_indicator/column_indicator';
import Column from '../../components/column'; import Column from '../../components/column';
import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';
import { me } from '../../initial_state';
import SectionHeadlineBar from '../../components/section_headline_bar' ; import SectionHeadlineBar from '../../components/section_headline_bar' ;
const messages = defineMessages({ const messages = defineMessages({
......
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,
}; };
...@@ -41,7 +39,6 @@ class SearchResults extends ImmutablePureComponent { ...@@ -41,7 +39,6 @@ class SearchResults extends ImmutablePureComponent {
let accounts, statuses, hashtags, groups; let accounts, statuses, hashtags, groups;
let count = 0; let count = 0;
if (results.get('accounts') && results.get('accounts').size > 0 && (isTop || showPeople)) { if (results.get('accounts') && results.get('accounts').size > 0 && (isTop || showPeople)) {
const size = isTop ? Math.min(results.get('accounts').size, 5) : results.get('accounts').size; const size = isTop ? Math.min(results.get('accounts').size, 5) : results.get('accounts').size;
count += size; count += size;
...@@ -53,7 +50,6 @@ class SearchResults extends ImmutablePureComponent { ...@@ -53,7 +50,6 @@ class SearchResults extends ImmutablePureComponent {
); );
} }
if (results.get('groups') && results.get('groups').size > 0 && (isTop || showGroups)) { if (results.get('groups') && results.get('groups').size > 0 && (isTop || showGroups)) {
const size = isTop ? Math.min(results.get('groups').size, 5) : results.get('groups').size; const size = isTop ? Math.min(results.get('groups').size, 5) : results.get('groups').size;
count += size; count += size;
......
...@@ -2,15 +2,18 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; ...@@ -2,15 +2,18 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { injectIntl, defineMessages } from 'react-intl'; import { injectIntl, defineMessages } from 'react-intl';
import spring from 'react-motion/lib/spring'; import spring from 'react-motion/lib/spring';
import {
changeComposing,
mountCompose,
unmountCompose,
} from '../../actions/compose';
import { mascot } from '../../initial_state';
import Motion from '../ui/util/optional_motion'; import Motion from '../ui/util/optional_motion';
import ComposeFormContainer from './containers/compose_form_container'; import ComposeFormContainer from './containers/compose_form_container';
import NavigationBar from './components/navigation_bar';
import { mountCompose, unmountCompose } from '../../actions/compose';
import SearchContainer from './containers/search_container'; import SearchContainer from './containers/search_container';
import SearchResultsContainer from './containers/search_results_container'; import SearchResultsContainer from './containers/search_results_container';
import { changeComposing } from '../../actions/compose'; import NavigationBar from './components/navigation_bar';
import elephantUIPlane from '../../../images/logo_ui_column_footer.png'; import elephantUIPlane from '../../../images/logo_ui_column_footer.png';
import { mascot } from '../../initial_state';
import './compose.scss'; import './compose.scss';
......
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' },
......
...@@ -2,10 +2,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; ...@@ -2,10 +2,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
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 { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
import DomainContainer from '../../containers/domain_container';
import ColumnIndicator from '../../components/column_indicator'; import ColumnIndicator from '../../components/column_indicator';
import Column from '../../components/column'; import Column from '../../components/column';
import DomainContainer from '../../containers/domain_container';
import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
import ScrollableList from '../../components/scrollable_list'; import ScrollableList from '../../components/scrollable_list';
const messages = defineMessages({ const messages = defineMessages({
......
...@@ -3,9 +3,9 @@ import { FormattedMessage } from 'react-intl'; ...@@ -3,9 +3,9 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites'; import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
import { meUsername } from '../../initial_state';
import Column from '../../components/column'; import Column from '../../components/column';
import StatusList from '../../components/status_list'; import StatusList from '../../components/status_list';
import { meUsername } from '../../initial_state';
import ColumnIndicator from '../../components/column_indicator'; import ColumnIndicator from '../../components/column_indicator';
const mapStateToProps = (state, { params: { username } }) => { const mapStateToProps = (state, { params: { username } }) => {
......
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 ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { authorizeFollowRequest, rejectFollowRequest } from '../../../../actions/accounts';
import { makeGetAccount } from '../../../../selectors';
import Permalink from '../../../../components/permalink'; import Permalink from '../../../../components/permalink';
import Avatar from '../../../../components/avatar'; import Avatar from '../../../../components/avatar';
import DisplayName from '../../../../components/display_name'; import DisplayName from '../../../../components/display_name';
import IconButton from '../../../../components/icon_button'; import IconButton from '../../../../components/icon_button';
import { makeGetAccount } from '../../../../selectors';
import { authorizeFollowRequest, rejectFollowRequest } from '../../../../actions/accounts';
import './account_authorize.scss'; import './account_authorize.scss';
......
...@@ -2,10 +2,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; ...@@ -2,10 +2,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
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 { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
import ColumnIndicator from '../../components/column_indicator'; import ColumnIndicator from '../../components/column_indicator';
import Column from '../../components/column'; import Column from '../../components/column';
import AccountAuthorize from './components/account_authorize'; import AccountAuthorize from './components/account_authorize';
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
import ScrollableList from '../../components/scrollable_list'; import ScrollableList from '../../components/scrollable_list'