Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
This commit is contained in:
		@@ -0,0 +1,67 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 | 
			
		||||
import AccountContainer from '../../../containers/account_container';
 | 
			
		||||
import StatusContainer from '../../../containers/status_container';
 | 
			
		||||
import { Link } from 'react-router';
 | 
			
		||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
			
		||||
 | 
			
		||||
class SearchResults extends ImmutablePureComponent {
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { results } = this.props;
 | 
			
		||||
 | 
			
		||||
    let accounts, statuses, hashtags;
 | 
			
		||||
    let count = 0;
 | 
			
		||||
 | 
			
		||||
    if (results.get('accounts') && results.get('accounts').size > 0) {
 | 
			
		||||
      count   += results.get('accounts').size;
 | 
			
		||||
      accounts = (
 | 
			
		||||
        <div className='search-results__section'>
 | 
			
		||||
          {results.get('accounts').map(accountId => <AccountContainer key={accountId} id={accountId} />)}
 | 
			
		||||
        </div>
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (results.get('statuses') && results.get('statuses').size > 0) {
 | 
			
		||||
      count   += results.get('statuses').size;
 | 
			
		||||
      statuses = (
 | 
			
		||||
        <div className='search-results__section'>
 | 
			
		||||
          {results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}
 | 
			
		||||
        </div>
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (results.get('hashtags') && results.get('hashtags').size > 0) {
 | 
			
		||||
      count += results.get('hashtags').size;
 | 
			
		||||
      hashtags = (
 | 
			
		||||
        <div className='search-results__section'>
 | 
			
		||||
          {results.get('hashtags').map(hashtag =>
 | 
			
		||||
            <Link className='search-results__hashtag' to={`/timelines/tag/${hashtag}`}>
 | 
			
		||||
              #{hashtag}
 | 
			
		||||
            </Link>
 | 
			
		||||
          )}
 | 
			
		||||
        </div>
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <div className='search-results'>
 | 
			
		||||
        <div className='search-results__header'>
 | 
			
		||||
          <FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} />
 | 
			
		||||
        </div>
 | 
			
		||||
 | 
			
		||||
        {accounts}
 | 
			
		||||
        {statuses}
 | 
			
		||||
        {hashtags}
 | 
			
		||||
      </div>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
SearchResults.propTypes = {
 | 
			
		||||
  results: ImmutablePropTypes.map.isRequired
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export default SearchResults;
 | 
			
		||||
		Reference in New Issue
	
	Block a user