Large update for all components

reorganization, linting, updating file imports, consolidation
warning: there will be errors in this commit
todo: update webpack, add missing styles, scss files, consolidate the rest of components within features/*

app/javascript/gabsocial/features/home_timeline/components/column_settings.js

@@ -1,8 +1,26 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, FormattedMessage } from 'react-intl';
-import SettingToggle from '../../notifications/components/setting_toggle';
+import SettingToggle from '../../../components/setting_toggle';
+import { changeSetting, saveSettings } from '../../../actions/settings';
 
-export default @injectIntl
+const mapStateToProps = state => ({
+  settings: state.getIn(['settings', 'home']),
+});
+
+const mapDispatchToProps = dispatch => ({
+
+  onChange(key, checked) {
+    dispatch(changeSetting(['home', ...key], checked));
+  },
+
+  onSave() {
+    dispatch(saveSettings());
+  },
+
+});
+
+export default @connect(mapStateToProps, mapDispatchToProps)
+@injectIntl
 class ColumnSettings extends PureComponent {
 
   static propTypes = {
@@ -19,11 +37,23 @@ class ColumnSettings extends PureComponent {
         <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reposts' />} />
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reblog']}
+            onChange={onChange}
+            label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reposts' />}
+          />
         </div>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
+          <SettingToggle
+            prefix='home_timeline'
+            settings={settings}
+            settingPath={['shows', 'reply']}
+            onChange={onChange}
+            label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />}
+          />
         </div>
       </div>
     );

app/javascript/gabsocial/features/home_timeline/containers/column_settings_container.js

@@ -1,20 +0,0 @@
-import ColumnSettings from '../components/column_settings';
-import { changeSetting, saveSettings } from '../../../actions/settings';
-
-const mapStateToProps = state => ({
-  settings: state.getIn(['settings', 'home']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onChange (key, checked) {
-    dispatch(changeSetting(['home', ...key], checked));
-  },
-
-  onSave () {
-    dispatch(saveSettings());
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);

app/javascript/gabsocial/features/home_timeline/index.js

@@ -1,9 +1,9 @@
-import { expandHomeTimeline } from '../../actions/timelines';
-import StatusListContainer from '../ui/containers/status_list_container';
-import Column from '../../components/column';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ColumnSettingsContainer from './containers/column_settings_container';
-import HomeColumnHeader from '../../components/home_column_header';
+import { expandHomeTimeline } from '../../actions/timelines';
+import StatusListContainer from '../../containers/status_list_container';
+import Column from '../../components/column';
+import ColumnSettings from './components/column_settings';
+import HomeColumnHeader from '../../components/column_header';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -66,10 +66,10 @@ class HomeTimeline extends PureComponent {
     const { intl, hasUnread } = this.props;
 
     return (
-      <Column label={intl.formatMessage(messages.title)}>
-        <HomeColumnHeader activeItem='home' active={hasUnread}>
-          <ColumnSettingsContainer />
-        </HomeColumnHeader>
+      <Column heading={intl.formatMessage(messages.title)}>
+        { /* <HomeColumnHeader activeItem='home' active={hasUnread}>
+          <ColumnSettings />
+        </HomeColumnHeader> */}
         <StatusListContainer
           scrollKey='home_timeline'
           onLoadMore={this.handleLoadMore}