From a4bb347151dbd4e329bfa00bd9e9bb73241ad838 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 24 Dec 2020 16:40:33 -0600 Subject: [PATCH] RemoteTimeline: remove column settings --- .../components/column_settings.js | 36 ------------------- .../containers/column_settings_container.js | 17 --------- app/soapbox/features/remote_timeline/index.js | 5 +-- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 app/soapbox/features/remote_timeline/components/column_settings.js delete mode 100644 app/soapbox/features/remote_timeline/containers/column_settings_container.js diff --git a/app/soapbox/features/remote_timeline/components/column_settings.js b/app/soapbox/features/remote_timeline/components/column_settings.js deleted file mode 100644 index 1d7bd7359..000000000 --- a/app/soapbox/features/remote_timeline/components/column_settings.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import { injectIntl, FormattedMessage } from 'react-intl'; -import SettingToggle from '../../notifications/components/setting_toggle'; - -export default @injectIntl -class ColumnSettings extends React.PureComponent { - - static propTypes = { - settings: ImmutablePropTypes.map.isRequired, - onChange: PropTypes.func.isRequired, - intl: PropTypes.object.isRequired, - }; - - render() { - const { settings, onChange } = this.props; - - return ( -
-
- } /> -
- -
- } /> -
- -
- } /> -
-
- ); - } - -} diff --git a/app/soapbox/features/remote_timeline/containers/column_settings_container.js b/app/soapbox/features/remote_timeline/containers/column_settings_container.js deleted file mode 100644 index ac001bcab..000000000 --- a/app/soapbox/features/remote_timeline/containers/column_settings_container.js +++ /dev/null @@ -1,17 +0,0 @@ -import { connect } from 'react-redux'; -import ColumnSettings from '../components/column_settings'; -import { getSettings, changeSetting } from '../../../actions/settings'; - -const mapStateToProps = state => ({ - settings: getSettings(state).get('public'), -}); - -const mapDispatchToProps = (dispatch) => { - return { - onChange(key, checked) { - dispatch(changeSetting(['public', ...key], checked)); - }, - }; -}; - -export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings); diff --git a/app/soapbox/features/remote_timeline/index.js b/app/soapbox/features/remote_timeline/index.js index 7094c8ddb..ee08192ff 100644 --- a/app/soapbox/features/remote_timeline/index.js +++ b/app/soapbox/features/remote_timeline/index.js @@ -4,7 +4,6 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../../components/column'; -import ColumnSettingsContainer from './containers/column_settings_container'; import HomeColumnHeader from '../../components/home_column_header'; import IconButton from 'soapbox/components/icon_button'; import { expandRemoteTimeline } from '../../actions/timelines'; @@ -84,9 +83,7 @@ class RemoteTimeline extends React.PureComponent { return ( - - - +