From d0e2733f63a7bd9601e73adee1107da804f85c41 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 3 Sep 2016 14:01:10 +0200 Subject: [PATCH] Fix reblogs of reblogs in UI, add follow form in UI --- .../javascripts/components/actions/follow.jsx | 16 ++++---- .../{composer_drawer.jsx => compose_form.jsx} | 8 ++-- .../components/components/drawer.jsx | 17 ++++++++ .../components/components/follow_form.jsx | 40 +++++++++++++++++++ .../components/components/frontend.jsx | 17 ++++++-- ...ntainer.jsx => compose_form_container.jsx} | 4 +- .../containers/follow_form_container.jsx | 24 +++++++++++ .../components/reducers/timelines.jsx | 2 + app/assets/stylesheets/components.scss | 2 +- app/models/account.rb | 4 +- 10 files changed, 113 insertions(+), 21 deletions(-) rename app/assets/javascripts/components/components/{composer_drawer.jsx => compose_form.jsx} (75%) create mode 100644 app/assets/javascripts/components/components/drawer.jsx create mode 100644 app/assets/javascripts/components/components/follow_form.jsx rename app/assets/javascripts/components/containers/{composer_drawer_container.jsx => compose_form_container.jsx} (87%) create mode 100644 app/assets/javascripts/components/containers/follow_form_container.jsx diff --git a/app/assets/javascripts/components/actions/follow.jsx b/app/assets/javascripts/components/actions/follow.jsx index 1c4e2c66ac..a09aded837 100644 --- a/app/assets/javascripts/components/actions/follow.jsx +++ b/app/assets/javascripts/components/actions/follow.jsx @@ -6,41 +6,41 @@ 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) { +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 diff --git a/app/assets/javascripts/components/components/composer_drawer.jsx b/app/assets/javascripts/components/components/compose_form.jsx similarity index 75% rename from app/assets/javascripts/components/components/composer_drawer.jsx rename to app/assets/javascripts/components/components/compose_form.jsx index 0d6a2a8d6a..6414120121 100644 --- a/app/assets/javascripts/components/components/composer_drawer.jsx +++ b/app/assets/javascripts/components/components/compose_form.jsx @@ -4,7 +4,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; 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, @@ -39,10 +39,10 @@ const ComposerDrawer = React.createClass({ } return ( -
+
{replyArea} -