diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-12 19:20:55 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-12 19:20:55 +0200 |
commit | d6a64f45fd4530cfee4f7721f0c6e7ca28fe677f (patch) | |
tree | 64b6813d49d458c5833f40c9668c4677f56eaf42 /app/assets/javascripts/components/actions | |
parent | 05b0c985b4d4b313e75ae506fb43b5690afade8d (diff) |
Adding a notification stack for error messages
Diffstat (limited to 'app/assets/javascripts/components/actions')
6 files changed, 42 insertions, 34 deletions
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx index a107b3352..48c442093 100644 --- a/app/assets/javascripts/components/actions/compose.jsx +++ b/app/assets/javascripts/components/actions/compose.jsx @@ -19,20 +19,20 @@ export function changeCompose(text) { type: COMPOSE_CHANGE, text: text }; -} +}; export function replyCompose(status) { return { type: COMPOSE_REPLY, status: status }; -} +}; export function cancelReplyCompose() { return { type: COMPOSE_REPLY_CANCEL }; -} +}; export function submitCompose() { return function (dispatch, getState) { @@ -48,27 +48,27 @@ export function submitCompose() { dispatch(submitComposeFail(error)); }); }; -} +}; export function submitComposeRequest() { return { type: COMPOSE_SUBMIT_REQUEST }; -} +}; export function submitComposeSuccess(status) { return { type: COMPOSE_SUBMIT_SUCCESS, status: status }; -} +}; export function submitComposeFail(error) { return { type: COMPOSE_SUBMIT_FAIL, error: error }; -} +}; export function uploadCompose(files) { return function (dispatch, getState) { @@ -87,13 +87,13 @@ export function uploadCompose(files) { dispatch(uploadComposeFail(error)); }); }; -} +}; export function uploadComposeRequest() { return { type: COMPOSE_UPLOAD_REQUEST }; -} +}; export function uploadComposeProgress(loaded, total) { return { @@ -101,25 +101,25 @@ export function uploadComposeProgress(loaded, total) { loaded: loaded, total: total }; -} +}; export function uploadComposeSuccess(media) { return { type: COMPOSE_UPLOAD_SUCCESS, media: media }; -} +}; export function uploadComposeFail(error) { return { type: COMPOSE_UPLOAD_FAIL, error: error }; -} +}; export function undoUploadCompose(media_id) { return { type: COMPOSE_UPLOAD_UNDO, media_id: media_id }; -} +}; diff --git a/app/assets/javascripts/components/actions/follow.jsx b/app/assets/javascripts/components/actions/follow.jsx index a09aded83..703ac0297 100644 --- a/app/assets/javascripts/components/actions/follow.jsx +++ b/app/assets/javascripts/components/actions/follow.jsx @@ -11,7 +11,7 @@ export function changeFollow(text) { type: FOLLOW_CHANGE, text: text }; -} +}; export function submitFollow() { return function (dispatch, getState) { @@ -25,24 +25,24 @@ export function submitFollow() { dispatch(submitFollowFail(error)); }); }; -} +}; export function submitFollowRequest() { return { type: FOLLOW_SUBMIT_REQUEST }; -} +}; export function submitFollowSuccess(account) { return { type: FOLLOW_SUBMIT_SUCCESS, account: account }; -} +}; export function submitFollowFail(error) { return { type: FOLLOW_SUBMIT_FAIL, error: error }; -} +}; diff --git a/app/assets/javascripts/components/actions/interactions.jsx b/app/assets/javascripts/components/actions/interactions.jsx index 964655530..84f5c4a4a 100644 --- a/app/assets/javascripts/components/actions/interactions.jsx +++ b/app/assets/javascripts/components/actions/interactions.jsx @@ -22,14 +22,14 @@ export function reblog(status) { dispatch(reblogFail(status, error)); }); }; -} +}; export function reblogRequest(status) { return { type: REBLOG_REQUEST, status: status }; -} +}; export function reblogSuccess(status, response) { return { @@ -37,7 +37,7 @@ export function reblogSuccess(status, response) { status: status, response: response }; -} +}; export function reblogFail(status, error) { return { @@ -45,7 +45,7 @@ export function reblogFail(status, error) { status: status, error: error }; -} +}; export function favourite(status) { return function (dispatch, getState) { @@ -57,14 +57,14 @@ export function favourite(status) { dispatch(favouriteFail(status, error)); }); }; -} +}; export function favouriteRequest(status) { return { type: FAVOURITE_REQUEST, status: status }; -} +}; export function favouriteSuccess(status, response) { return { @@ -72,7 +72,7 @@ export function favouriteSuccess(status, response) { status: status, response: response }; -} +}; export function favouriteFail(status, error) { return { @@ -80,4 +80,4 @@ export function favouriteFail(status, error) { status: status, error: error }; -} +}; diff --git a/app/assets/javascripts/components/actions/meta.jsx b/app/assets/javascripts/components/actions/meta.jsx index e0f127231..d0adbce3f 100644 --- a/app/assets/javascripts/components/actions/meta.jsx +++ b/app/assets/javascripts/components/actions/meta.jsx @@ -5,4 +5,4 @@ export function setAccessToken(token) { type: ACCESS_TOKEN_SET, token: token }; -} +}; diff --git a/app/assets/javascripts/components/actions/notifications.jsx b/app/assets/javascripts/components/actions/notifications.jsx new file mode 100644 index 000000000..cf1e50a69 --- /dev/null +++ b/app/assets/javascripts/components/actions/notifications.jsx @@ -0,0 +1,8 @@ +export const NOTIFICATION_DISMISS = 'NOTIFICATION_DISMISS'; + +export function dismissNotification(notification) { + return { + type: NOTIFICATION_DISMISS, + notification: notification + }; +}; diff --git a/app/assets/javascripts/components/actions/timelines.jsx b/app/assets/javascripts/components/actions/timelines.jsx index 383b727e9..05c12cc6d 100644 --- a/app/assets/javascripts/components/actions/timelines.jsx +++ b/app/assets/javascripts/components/actions/timelines.jsx @@ -14,7 +14,7 @@ export function setTimeline(timeline, statuses) { timeline: timeline, statuses: statuses }; -} +}; export function updateTimeline(timeline, status) { return { @@ -22,21 +22,21 @@ export function updateTimeline(timeline, status) { timeline: timeline, status: status }; -} +}; export function deleteFromTimelines(id) { return { type: TIMELINE_DELETE, id: id }; -} +}; export function refreshTimelineRequest(timeline) { return { type: TIMELINE_REFRESH_REQUEST, timeline: timeline }; -} +}; export function refreshTimeline(timeline) { return function (dispatch, getState) { @@ -48,13 +48,13 @@ export function refreshTimeline(timeline) { dispatch(refreshTimelineFail(timeline, error)); }); }; -} +}; export function refreshTimelineSuccess(timeline, statuses) { return function (dispatch) { dispatch(setTimeline(timeline, statuses)); }; -} +}; export function refreshTimelineFail(timeline, error) { return { @@ -62,4 +62,4 @@ export function refreshTimelineFail(timeline, error) { timeline: timeline, error: error }; -} +}; |