mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 17:35:40 +01:00
Preparing for follow form
This commit is contained in:
parent
c249ceb10c
commit
2d57bcf1b7
4 changed files with 77 additions and 3 deletions
48
app/assets/javascripts/components/actions/follow.jsx
Normal file
48
app/assets/javascripts/components/actions/follow.jsx
Normal file
|
@ -0,0 +1,48 @@
|
|||
import api from '../api'
|
||||
|
||||
export const FOLLOW_CHANGE = 'FOLLOW_CHANGE';
|
||||
export const FOLLOW_SUBMIT = 'FOLLOW_SUBMIT';
|
||||
export const FOLLOW_SUBMIT_REQUEST = 'FOLLOW_SUBMIT_REQUEST';
|
||||
export const FOLLOW_SUBMIT_SUCCESS = 'FOLLOW_SUBMIT_SUCCESS';
|
||||
export const FOLLOW_SUBMIT_FAIL = 'FOLLOW_SUBMIT_FAIL';
|
||||
|
||||
export function followChange(text) {
|
||||
return {
|
||||
type: FOLLOW_CHANGE,
|
||||
text: text
|
||||
};
|
||||
}
|
||||
|
||||
export function followSubmit() {
|
||||
return function (dispatch, getState) {
|
||||
dispatch(followSubmitRequest());
|
||||
|
||||
api(getState).post('/api/follows', {
|
||||
uri: getState().getIn(['follow', 'text'])
|
||||
}).then(function (response) {
|
||||
dispatch(followSubmitSuccess(response.data));
|
||||
}).catch(function (error) {
|
||||
dispatch(followSubmitFail(error));
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
export function followSubmitRequest() {
|
||||
return {
|
||||
type: FOLLOW_SUBMIT_REQUEST
|
||||
};
|
||||
}
|
||||
|
||||
export function followSubmitSuccess(account) {
|
||||
return {
|
||||
type: FOLLOW_SUBMIT_SUCCESS,
|
||||
account: account
|
||||
};
|
||||
}
|
||||
|
||||
export function followSubmitFail(error) {
|
||||
return {
|
||||
type: FOLLOW_SUBMIT_FAIL,
|
||||
error: error
|
||||
};
|
||||
}
|
|
@ -34,10 +34,10 @@ const Status = React.createClass({
|
|||
|
||||
if (status.get('reblog') !== null) {
|
||||
return (
|
||||
<div>
|
||||
<div style={{ cursor: 'pointer' }}>
|
||||
<div style={{ marginLeft: '68px', color: '#616b86', padding: '8px 0', paddingBottom: '2px', fontSize: '14px', position: 'relative' }}>
|
||||
<div style={{ position: 'absolute', 'left': '-26px'}}><i className='fa fa-fw fa-retweet'></i></div>
|
||||
<a href={status.getIn(['account', 'url'])} style={{ color: '#616b86' }}>{status.getIn(['account', 'display_name'])}</a> reblogged
|
||||
<a href={status.getIn(['account', 'url'])} className='status__display-name'><strong style={{ color: '#616b86'}}>{status.getIn(['account', 'display_name'])}</strong></a> reblogged
|
||||
</div>
|
||||
|
||||
<Status {...other} status={status.get('reblog')} />
|
||||
|
|
24
app/assets/javascripts/components/reducers/follow.jsx
Normal file
24
app/assets/javascripts/components/reducers/follow.jsx
Normal file
|
@ -0,0 +1,24 @@
|
|||
import * as constants from '../actions/follow';
|
||||
import Immutable from 'immutable';
|
||||
|
||||
const initialState = Immutable.Map({
|
||||
text: '',
|
||||
is_submitting: false
|
||||
});
|
||||
|
||||
export default function compose(state = initialState, action) {
|
||||
switch(action.type) {
|
||||
case constants.FOLLOW_CHANGE:
|
||||
return state.set('text', action.text);
|
||||
case constants.FOLLOW_SUBMIT_REQUEST:
|
||||
return state.set('is_submitting', true);
|
||||
case constants.FOLLOW_SUBMIT_SUCCESS:
|
||||
return state.withMutations(map => {
|
||||
map.set('text', '').set('is_submitting', false);
|
||||
});
|
||||
case constants.FOLLOW_SUBMIT_FAIL:
|
||||
return state.set('is_submitting', false);
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
|
@ -2,9 +2,11 @@ import { combineReducers } from 'redux-immutable';
|
|||
import timelines from './timelines';
|
||||
import meta from './meta';
|
||||
import compose from './compose';
|
||||
import follow from './follow';
|
||||
|
||||
export default combineReducers({
|
||||
timelines,
|
||||
meta,
|
||||
compose
|
||||
compose,
|
||||
follow
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue