Progress

2020-02-24 18:25:55 -05:00
parent 7679012e2f
commit 32cd8e622a
62 changed files with 404 additions and 771 deletions
--- a/app/javascript/gabsocial/features/notifications/components/column_settings/column_settings.js
+++ b/app/javascript/gabsocial/features/notifications/components/column_settings/column_settings.js
@@ -3,7 +3,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
 import ColumnHeaderSettingButton from '../../../../components/column_header_setting_button';
 import SettingToggle from '../../../../components/setting_toggle';
-import ColumnSettingsHeading from '../../../../components/column_settings_heading';

 export default class ColumnSettings extends ImmutablePureComponent {

@@ -18,14 +17,14 @@ export default class ColumnSettings extends ImmutablePureComponent {
    this.props.onChange(['push', ...path], checked);
  }

-  render () {
+  render() {
    const { settings, pushSettings, onChange, onClear } = this.props;

    const filterShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show' defaultMessage='Show' />;
    const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
-    const alertStr  = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
-    const showStr   = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
-    const soundStr  = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
+    const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
+    const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
+    const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;

    const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
    const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
@@ -39,20 +38,13 @@ export default class ColumnSettings extends ImmutablePureComponent {
        />

        <div role='group' aria-labelledby='notifications-filter-bar'>
-          <ColumnSettingsHeading
-            id='notifications-filter-bar'
-            heading={<FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />}
-          />
+          <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
          <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterShowStr} />
          <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
        </div>

        <div role='group' aria-labelledby='notifications-follow'>
-          <ColumnSettingsHeading
-            id='notifications-follow'
-            heading={<FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' />}
-          />
-
+          <FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' />
          <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow']} onChange={this.onPushChange} label={pushStr} />}
          <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
@@ -60,11 +52,7 @@ export default class ColumnSettings extends ImmutablePureComponent {
        </div>

        <div role='group' aria-labelledby='notifications-favourite'>
-          <ColumnSettingsHeading
-            id='notifications-favourite'
-            heading={<FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' />}
-          />
-
+          <FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favorites:' />
          <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'favourite']} onChange={this.onPushChange} label={pushStr} />}
          <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
@@ -72,11 +60,7 @@ export default class ColumnSettings extends ImmutablePureComponent {
        </div>

        <div role='group' aria-labelledby='notifications-mention'>
-          <ColumnSettingsHeading
-            id='notifications-mention'
-            heading={<FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' />}
-          />
-
+          <FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' />
          <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'mention']} onChange={this.onPushChange} label={pushStr} />}
          <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
@@ -84,11 +68,7 @@ export default class ColumnSettings extends ImmutablePureComponent {
        </div>

        <div role='group' aria-labelledby='notifications-reblog'>
-          <ColumnSettingsHeading
-            id='notifications-reblog'
-            heading={<FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Reposts:' />}
-          />
-
+          <FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Reposts:' />
          <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'reblog']} onChange={this.onPushChange} label={pushStr} />}
          <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
@@ -96,11 +76,7 @@ export default class ColumnSettings extends ImmutablePureComponent {
        </div>

        <div role='group' aria-labelledby='notifications-poll'>
-          <ColumnSettingsHeading
-            id='notifications-poll'
-            heading={<FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' />}
-          />
-
+          <FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' />
          <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'poll']} onChange={onChange} label={alertStr} />
          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'poll']} onChange={this.onPushChange} label={pushStr} />}
          <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'poll']} onChange={onChange} label={showStr} />
--- a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
+++ b/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
@@ -1,5 +1,4 @@
 import { defineMessages, injectIntl } from 'react-intl';
-import SectionHeadlineBar from '../../../../components/section_headline_bar';

 const messages = defineMessages({
  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
@@ -30,7 +29,7 @@ class NotificationFilterBar extends PureComponent {

    if (!advancedMode) {
      return (
-        <SectionHeadlineBar
+        { /* <SectionHeadlineBar
          items={[
            {
              className: selectedFilter === 'all' ? 'active' : '',
@@ -43,12 +42,15 @@ class NotificationFilterBar extends PureComponent {
              title: intl.formatMessage(messages.filterMentions),
            }
          ]}
-        />
+        /> */ }
      )
    }

    return (
-      <SectionHeadlineBar
+      <div />
+    )
+
+    /* <SectionHeadlineBar
        items={[
          {
            className: selectedFilter === 'all' ? 'active' : '',
@@ -86,8 +88,7 @@ class NotificationFilterBar extends PureComponent {
            icon: 'user-plus',
          },
        ]}
-      />
-    )
+      /> */
  }

 }