ff9f2088f7
Squashed commit of the following: commit 3842f879865818a3299f8283f8ed1b43c5566500 Author: Surinna Curtis <ekiru.0@gmail.com> Date: Mon Jul 3 19:57:39 2017 -0500 Fix some style issues commit 08628a0234392ecac90e869a1272f429de0b6db2 Author: Surinna Curtis <ekiru.0@gmail.com> Date: Mon Jul 3 19:35:22 2017 -0500 Improved styling and layout of select app settings commit 1787a7c20f2bf7101c6d6830450564178314a737 Author: Surinna Curtis <ekiru.0@gmail.com> Date: Mon Jul 3 17:13:53 2017 -0500 remove the layout selector ui from the drawer commit 7d93b180b1e615e2c36210ad6f119fe80a2778d8 Author: Surinna Curtis <ekiru.0@gmail.com> Date: Mon Jul 3 17:01:51 2017 -0500 Add layout setting to app settings modal
102 lines
4.0 KiB
JavaScript
102 lines
4.0 KiB
JavaScript
import React from 'react';
|
|
import ComposeFormContainer from './containers/compose_form_container';
|
|
import NavigationContainer from './containers/navigation_container';
|
|
import PropTypes from 'prop-types';
|
|
import { connect } from 'react-redux';
|
|
import { mountCompose, unmountCompose } from '../../actions/compose';
|
|
import { openModal } from '../../actions/modal';
|
|
import { changeLocalSetting } from '../../actions/local_settings';
|
|
import Link from 'react-router-dom/Link';
|
|
import { injectIntl, defineMessages } from 'react-intl';
|
|
import SearchContainer from './containers/search_container';
|
|
import Motion from 'react-motion/lib/Motion';
|
|
import spring from 'react-motion/lib/spring';
|
|
import SearchResultsContainer from './containers/search_results_container';
|
|
|
|
const messages = defineMessages({
|
|
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
|
|
public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
|
|
community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
|
|
settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
|
|
logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
|
|
});
|
|
|
|
const mapStateToProps = state => ({
|
|
showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
|
|
});
|
|
|
|
@connect(mapStateToProps)
|
|
@injectIntl
|
|
export default class Compose extends React.PureComponent {
|
|
|
|
static propTypes = {
|
|
dispatch: PropTypes.func.isRequired,
|
|
multiColumn: PropTypes.bool,
|
|
showSearch: PropTypes.bool,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
componentDidMount () {
|
|
this.props.dispatch(mountCompose());
|
|
}
|
|
|
|
componentWillUnmount () {
|
|
this.props.dispatch(unmountCompose());
|
|
}
|
|
|
|
onLayoutClick = (e) => {
|
|
const layout = e.currentTarget.getAttribute('data-mastodon-layout');
|
|
this.props.dispatch(changeLocalSetting(['layout'], layout));
|
|
e.preventDefault();
|
|
}
|
|
|
|
openSettings = () => {
|
|
this.props.dispatch(openModal('SETTINGS', {}));
|
|
}
|
|
|
|
render () {
|
|
const { multiColumn, showSearch, intl } = this.props;
|
|
|
|
let header = '';
|
|
|
|
if (multiColumn) {
|
|
header = (
|
|
<div className='drawer__header'>
|
|
<Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' aria-label={intl.formatMessage(messages.start)} className='fa fa-fw fa-asterisk' /></Link>
|
|
<Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' aria-label={intl.formatMessage(messages.community)} className='fa fa-fw fa-users' /></Link>
|
|
<Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' aria-label={intl.formatMessage(messages.public)} className='fa fa-fw fa-globe' /></Link>
|
|
<a onClick={this.openSettings} role='button' tabIndex='0' className='drawer__tab' title={intl.formatMessage(messages.settings)}><i role='img' aria-label={intl.formatMessage(messages.settings)} className='fa fa-fw fa-cogs' /></a>
|
|
<a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' aria-label={intl.formatMessage(messages.logout)} className='fa fa-fw fa-sign-out' /></a>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
|
|
|
|
return (
|
|
<div className='drawer'>
|
|
{header}
|
|
|
|
<SearchContainer />
|
|
|
|
<div className='drawer__pager'>
|
|
<div className='drawer__inner'>
|
|
<NavigationContainer />
|
|
<ComposeFormContainer />
|
|
</div>
|
|
|
|
<Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
|
|
{({ x }) =>
|
|
<div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
|
|
<SearchResultsContainer />
|
|
</div>
|
|
}
|
|
</Motion>
|
|
</div>
|
|
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|