random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated search UI header and results

Browse Source 
Added groups with new items for filtering search results
This commit is contained in:
mgabdev
2020-01-14 18:14:54 -05:00
parent b39cdfae11
commit 69ea7fcdc6
5 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/javascript/gabsocial/features/search/components/header.js
View File

@@ -1,8 +1,7 @@
import React from 'react';
import { connect } from 'react-redux';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { withRouter } from 'react-router-dom';
import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { FormattedMessage } from 'react-intl';
import { NavLink } from 'react-router-dom';
@@ -11,7 +10,10 @@ const mapStateToProps = state => ({
submitted: state.getIn(['search', 'submitted']),
});
class Header extends ImmutablePureComponent {
export default
@withRouter
@connect(mapStateToProps)
class Header extends React.PureComponent {
static propTypes = {
value: PropTypes.string,
@@ -32,10 +34,6 @@ class Header extends ImmutablePureComponent {
render () {
const { submittedValue } = this.state;
if (!submittedValue) {
return null;
}
return (
<div className='search-header'>
<div className='search-header__text-container'>
@@ -46,27 +44,22 @@ class Header extends ImmutablePureComponent {
<div className='search-header__type-filters'>
<div className='account__section-headline'>
<div className='search-header__type-filters-tabs'>
<NavLink to='/search' activeClassName='active'>
<NavLink to='/search' exact activeClassName='active'>
<FormattedMessage id='search_results.top' defaultMessage='Top' />
</NavLink>
{/*<NavLink to='/search/gabs' activeClassName='active'>
<FormattedMessage id='search_results.statuses' defaultMessage='Gabs' />
</NavLink>
<NavLink to='/search/people' activeClassName='active'>
<NavLink to='/search/people' exact activeClassName='active'>
<FormattedMessage id='search_results.accounts' defaultMessage='People' />
</NavLink>
<NavLink to='/search/hashtags' activeClassName='active'>
<NavLink to='/search/hashtags' exact activeClassName='active'>
<FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' />
</NavLink>
<NavLink to='/search/groups' activeClassName='active'>
<NavLink to='/search/groups' exact activeClassName='active'>
<FormattedMessage id='search_results.groups' defaultMessage='Groups' />
</NavLink>*/}
</NavLink>
</div>
</div>
</div>
</div>
);
}
}
export default connect(mapStateToProps)(Header);
}