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/status/components/action_bar.js

@@ -36,6 +36,9 @@ const mapDispatchToProps = (dispatch) => ({
   },
 });
 
+
+export default @connect(null, mapDispatchToProps)
+@injectIntl
 class ActionBar extends PureComponent {
 
   static contextTypes = {
@@ -213,7 +216,7 @@ class ActionBar extends PureComponent {
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /></div>
         <div className='detailed-status__button'><IconButton disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div>
-        <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
+        <div className='detailed-status__button'><IconButton className='star-icon' active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /></div>
         {shareButton}
 
         <div className='detailed-status__action-bar-dropdown'>
@@ -222,6 +225,5 @@ class ActionBar extends PureComponent {
       </div>
     );
   }
-}
 
-export default injectIntl(connect(null, mapDispatchToProps)(ActionBar));
+}

app/javascript/gabsocial/features/status/components/card.js

@@ -2,7 +2,7 @@ import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import punycode from 'punycode';
 import classnames from 'classnames';
-import Icon from 'gabsocial/components/icon';
+import Icon from '../../../components/icon';
 
 const IDNA_PREFIX = 'xn--';
 

app/javascript/gabsocial/features/status/components/detailed_status.js

@@ -1,17 +1,17 @@
+import { Link, NavLink } from 'react-router-dom';
+import { FormattedDate, FormattedNumber } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import classNames from 'classnames';
 import Avatar from '../../../components/avatar';
 import DisplayName from '../../../components/display_name';
 import StatusContent from '../../../components/status_content';
 import MediaGallery from '../../../components/media_gallery';
-import { Link, NavLink } from 'react-router-dom';
-import { FormattedDate, FormattedNumber } from 'react-intl';
 import Card from './card';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
 import scheduleIdleTask from '../../../utils/schedule_idle_task';
-import classNames from 'classnames';
-import Icon from 'gabsocial/components/icon';
-import PollContainer from 'gabsocial/containers/poll_container';
+import Icon from '../../../components/icon';
+import Poll from '../../../components/poll';
 
 export default class DetailedStatus extends ImmutablePureComponent {
 
@@ -97,7 +97,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
     }
 
     if (status.get('poll')) {
-      media = <PollContainer pollId={status.get('poll')} />;
+      media = <Poll pollId={status.get('poll')} />;
     } else if (status.get('media_attachments').size > 0) {
       if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         const video = status.getIn(['media_attachments', 0]);

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

@@ -1,11 +1,13 @@
 import Immutable from 'immutable';
 import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { HotKeys } from 'react-hotkeys';
 import { fetchStatus } from '../../actions/statuses';
-import MissingIndicator from '../../components/missing_indicator';
 import DetailedStatus from './components/detailed_status';
 import ActionBar from './components/action_bar';
-import Column from '../ui/components/column';
+import Column from '../../components/column';
 import {
   favourite,
   unfavourite,
@@ -33,13 +35,11 @@ import { makeGetStatus } from '../../selectors';
 import ColumnHeader from '../../components/column_header';
 import StatusContainer from '../../containers/status_container';
 import { openModal } from '../../actions/modal';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { HotKeys } from 'react-hotkeys';
 import { boostModal, deleteModal, me } from '../../initial_state';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../../utils/fullscreen';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
-import Icon from 'gabsocial/components/icon';
+import Icon from '../../components/icon';
+import ColumnIndicator from '../../components/column_indicator';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -61,7 +61,7 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => {
     const status = getStatus(state, {
       id: props.params.statusId,
-      username: props.params.username
+      username: props.params.username,
     });
 
     let ancestorsIds = Immutable.List();
@@ -420,11 +420,7 @@ class Status extends ImmutablePureComponent {
     const { fullscreen } = this.state;
 
     if (status === null) {
-      return (
-        <Column>
-          <MissingIndicator />
-        </Column>
-      );
+      return (<ColumnIndicator type='missing' />);
     }
 
     if (ancestorsIds && ancestorsIds.size > 0) {
@@ -448,7 +444,7 @@ class Status extends ImmutablePureComponent {
     };
 
     return (
-      <Column label={intl.formatMessage(messages.detailedStatus)}>
+      <Column heading={intl.formatMessage(messages.detailedStatus)}>
         { me &&
           <ColumnHeader
             extraButton={(
@@ -458,10 +454,11 @@ class Status extends ImmutablePureComponent {
                 aria-label={intl.formatMessage(status.get('hidden') ? messages.revealAll : messages.hideAll)}
                 onClick={this.handleToggleAll}
                 aria-pressed={
-                  status.get('hidden') ? 'false' : 'true'}>
-                  <Icon id={status.get('hidden') ? 'eye-slash' : 'eye'
+                  status.get('hidden') ? 'false' : 'true'}
+              >
+                <Icon id={status.get('hidden') ? 'eye-slash' : 'eye'
                 }
-              />
+                />
               </button>
             )}
           />