export const FOLLOW_SUBMIT_SUCCESS = 'FOLLOW_SUBMIT_SUCCESS';
export const FOLLOW_SUBMIT_FAIL = 'FOLLOW_SUBMIT_FAIL';
-export function followChange(text) {
+export function changeFollow(text) {
return {
type: FOLLOW_CHANGE,
text: text
};
}
-export function followSubmit() {
+export function submitFollow() {
return function (dispatch, getState) {
- dispatch(followSubmitRequest());
+ dispatch(submitFollowRequest());
api(getState).post('/api/follows', {
uri: getState().getIn(['follow', 'text'])
}).then(function (response) {
- dispatch(followSubmitSuccess(response.data));
+ dispatch(submitFollowSuccess(response.data));
}).catch(function (error) {
- dispatch(followSubmitFail(error));
+ dispatch(submitFollowFail(error));
});
};
}
-export function followSubmitRequest() {
+export function submitFollowRequest() {
return {
type: FOLLOW_SUBMIT_REQUEST
};
}
-export function followSubmitSuccess(account) {
+export function submitFollowSuccess(account) {
return {
type: FOLLOW_SUBMIT_SUCCESS,
account: account
};
}
-export function followSubmitFail(error) {
+export function submitFollowFail(error) {
return {
type: FOLLOW_SUBMIT_FAIL,
error: error
import ImmutablePropTypes from 'react-immutable-proptypes';
import ReplyIndicator from './reply_indicator';
-const ComposerDrawer = React.createClass({
+const ComposeForm = React.createClass({
propTypes: {
text: React.PropTypes.string.isRequired,
}
return (
- <div style={{ width: '280px', boxSizing: 'border-box', background: '#454b5e', margin: '10px', marginRight: '0', padding: '10px' }}>
+ <div style={{ marginBottom: '30px', padding: '10px' }}>
{replyArea}
- <textarea disabled={this.props.is_submitting} placeholder='What is on your mind?' value={this.props.text} onKeyUp={this.handleKeyUp} onChange={this.handleChange} className='compose-drawer__textarea' style={{ display: 'block', boxSizing: 'border-box', width: '100%', height: '100px', resize: 'none', border: 'none', color: '#282c37', padding: '10px', fontFamily: 'Roboto', fontSize: '14px', margin: '0' }} />
+ <textarea disabled={this.props.is_submitting} placeholder='What is on your mind?' value={this.props.text} onKeyUp={this.handleKeyUp} onChange={this.handleChange} className='compose-form__textarea' style={{ display: 'block', boxSizing: 'border-box', width: '100%', height: '100px', resize: 'none', border: 'none', color: '#282c37', padding: '10px', fontFamily: 'Roboto', fontSize: '14px', margin: '0' }} />
<div style={{ marginTop: '10px', overflow: 'hidden' }}>
<div style={{ float: 'right' }}><Button text='Publish' onClick={this.handleSubmit} disabled={this.props.is_submitting} /></div>
});
-export default ComposerDrawer;
+export default ComposeForm;
--- /dev/null
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+
+const Drawer = React.createClass({
+
+ mixins: [PureRenderMixin],
+
+ render () {
+ return (
+ <div style={{ width: '280px', boxSizing: 'border-box', background: '#454b5e', margin: '10px', marginRight: '0', padding: '0', display: 'flex', flexDirection: 'column' }}>
+ {this.props.children}
+ </div>
+ );
+ }
+
+});
+
+export default Drawer;
--- /dev/null
+import IconButton from './icon_button';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+
+const FollowForm = React.createClass({
+
+ propTypes: {
+ text: React.PropTypes.string.isRequired,
+ is_submitting: React.PropTypes.bool,
+ onChange: React.PropTypes.func.isRequired,
+ onSubmit: React.PropTypes.func.isRequired
+ },
+
+ mixins: [PureRenderMixin],
+
+ handleChange (e) {
+ this.props.onChange(e.target.value);
+ },
+
+ handleKeyUp (e) {
+ if (e.keyCode === 13) {
+ this.props.onSubmit();
+ }
+ },
+
+ handleSubmit () {
+ this.props.onSubmit();
+ },
+
+ render () {
+ return (
+ <div style={{ display: 'flex', lineHeight: '20px', padding: '10px', background: '#373b4a' }}>
+ <input type='text' disabled={this.props.is_submitting} placeholder='username@domain' value={this.props.text} onKeyUp={this.handleKeyUp} onChange={this.handleChange} className='follow-form__input' style={{ flex: '1 1 auto', boxSizing: 'border-box', display: 'block', border: 'none', padding: '10px', fontFamily: 'Roboto', color: '#282c37', fontSize: '14px', margin: '0' }} />
+ <div style={{ padding: '10px', paddingRight: '0' }}><IconButton title='Follow' size={20} icon='user-plus' onClick={this.handleSubmit} disabled={this.props.is_submitting} /></div>
+ </div>
+ );
+ }
+
+});
+
+export default FollowForm;
-import ColumnsArea from './columns_area';
-import ComposerDrawerContainer from '../containers/composer_drawer_container';
-import PureRenderMixin from 'react-addons-pure-render-mixin';
+import ColumnsArea from './columns_area';
+import Drawer from './drawer';
+import ComposeFormContainer from '../containers/compose_form_container';
+import FollowFormContainer from '../containers/follow_form_container';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
const Frontend = React.createClass({
render () {
return (
<div style={{ flex: '0 0 auto', display: 'flex', width: '100%', height: '100%', background: '#1a1c23' }}>
- <ComposerDrawerContainer />
+ <Drawer>
+ <div style={{ flex: '1 1 auto' }}>
+ <ComposeFormContainer />
+ </div>
+
+ <FollowFormContainer />
+ </Drawer>
+
<ColumnsArea />
</div>
);
import { connect } from 'react-redux';
-import ComposerDrawer from '../components/composer_drawer';
+import ComposeForm from '../components/compose_form';
import { changeCompose, submitCompose, cancelReplyCompose } from '../actions/compose';
const mapStateToProps = function (state, props) {
}
};
-export default connect(mapStateToProps, mapDispatchToProps)(ComposerDrawer);
+export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm);
--- /dev/null
+import { connect } from 'react-redux';
+import FollowForm from '../components/follow_form';
+import { changeFollow, submitFollow } from '../actions/follow';
+
+const mapStateToProps = function (state, props) {
+ return {
+ text: state.getIn(['follow', 'text']),
+ is_submitting: state.getIn(['follow', 'is_submitting'])
+ };
+};
+
+const mapDispatchToProps = function (dispatch) {
+ return {
+ onChange: function (text) {
+ dispatch(changeFollow(text));
+ },
+
+ onSubmit: function () {
+ dispatch(submitFollow());
+ }
+ }
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(FollowForm);
return list.map(function (status) {
if (status.get('id') === needle.get('id')) {
return callback(status);
+ } else if (status.getIn(['reblog', 'id'], null) === needle.get('id')) {
+ return status.set('reblog', callback(status.get('reblog')));
}
return status;
}
}
-.compose-drawer__textarea {
+.compose-form__textarea, .follow-form__input {
background: #fff;
&:disabled {
end
def favourited?(status)
- (status.reblog? ? status.reblog : status).favourites.where(account: self).count == 1
+ (status.reblog? ? status.reblog : status).favourites.where(account: self).count > 0
end
def reblogged?(status)
- (status.reblog? ? status.reblog : status).reblogs.where(account: self).count == 1
+ (status.reblog? ? status.reblog : status).reblogs.where(account: self).count > 0
end
def keypair
cat aescling's git repositories / mastodon.git / commitdiff