From 931ecc8824e81c4dcaeb900290c09145b4ed7351 Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 13 Mar 2019 19:29:54 +0100 Subject: [PATCH] [Glitch] Add UI for enabling/disabling poll notifications --- .../flavours/glitch/components/status_prepend.js | 2 +- .../notifications/components/column_settings.js | 11 +++++++++++ .../features/notifications/components/filter_bar.js | 8 ++++++++ .../flavours/glitch/reducers/push_notifications.js | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/components/status_prepend.js b/app/javascript/flavours/glitch/components/status_prepend.js index d1a7c5833..481e6644e 100644 --- a/app/javascript/flavours/glitch/components/status_prepend.js +++ b/app/javascript/flavours/glitch/components/status_prepend.js @@ -66,7 +66,7 @@ export default class StatusPrepend extends React.PureComponent { return ( ); } diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.js b/app/javascript/flavours/glitch/features/notifications/components/column_settings.js index 4e35d5b4e..e29bd61f5 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.js @@ -90,6 +90,17 @@ export default class ColumnSettings extends React.PureComponent { + +
+ + +
+ + {showPushSettings && } + + +
+
); } diff --git a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js index f95a2c9de..3457b7598 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js +++ b/app/javascript/flavours/glitch/features/notifications/components/filter_bar.js @@ -6,6 +6,7 @@ const tooltips = defineMessages({ mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' }, boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' }, + polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' }, follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, }); @@ -78,6 +79,13 @@ class FilterBar extends React.PureComponent { > +