diff --git a/app/javascript/gabsocial/features/list_edit/components/account.js b/app/javascript/gabsocial/features/list_edit/components/account.js
index 680f10b9..7bd012c6 100644
--- a/app/javascript/gabsocial/features/list_edit/components/account.js
+++ b/app/javascript/gabsocial/features/list_edit/components/account.js
@@ -6,7 +6,7 @@ import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
import { makeGetAccount } from '../../../selectors';
import Avatar from '../../../components/avatar';
import DisplayName from '../../../components/display_name';
-import IconButton from '../../../components/icon_button';
+import Button from '../../../components/button';
const messages = defineMessages({
remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },
@@ -52,9 +52,9 @@ class Account extends ImmutablePureComponent {
let button;
if (added) {
- button =
;
+ button =
;
} else {
- button =
;
+ button =
;
}
return (
diff --git a/app/javascript/gabsocial/features/list_edit/list_edit.js b/app/javascript/gabsocial/features/list_edit/list_edit.js
index eb6ee548..1b6e118d 100644
--- a/app/javascript/gabsocial/features/list_edit/list_edit.js
+++ b/app/javascript/gabsocial/features/list_edit/list_edit.js
@@ -1,22 +1,32 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { injectIntl, defineMessages } from 'react-intl';
-import { setupListEditor, resetListEditor } from '../../actions/lists';
-import Account from './components/account';
-import ListEditorSearch from './components/list_editor_search';
-import EditListForm from './components/edit_list_form/edit_list_form';
-import IconButton from '../../components/icon_button';
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import ImmutablePureComponent from 'react-immutable-pure-component'
+import { injectIntl, defineMessages } from 'react-intl'
+import isObject from 'lodash.isobject'
+import { setupListEditor, resetListEditor } from '../../actions/lists'
+import Account from './components/account'
+import ListEditorSearch from './components/list_editor_search'
+import EditListForm from './components/edit_list_form/edit_list_form'
+import Button from '../../components/button'
import Input from '../../components/input'
-const mapStateToProps = state => ({
- accountIds: state.getIn(['listEditor', 'accounts', 'items']),
- searchAccountIds: state.getIn(['listEditor', 'suggestions', 'items']),
-});
+const mapStateToProps = (state, { params }) => {
+
+ console.log("params:", params)
+
+ const listId = isObject(params) ? params['id'] : null
+
+ return {
+ listId,
+ title: state.getIn(['listEditor', 'title']),
+ accountIds: state.getIn(['listEditor', 'accounts', 'items']),
+ searchAccountIds: state.getIn(['listEditor', 'suggestions', 'items']),
+ }
+}
const mapDispatchToProps = dispatch => ({
onInitialize: listId => dispatch(setupListEditor(listId)),
onReset: () => dispatch(resetListEditor()),
-});
+})
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -24,7 +34,8 @@ const messages = defineMessages({
addToList: { id: 'lists.account.add', defaultMessage: 'Add to list' },
removeFromList: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },
editList: { id: 'lists.edit', defaultMessage: 'Edit list' },
-});
+ editListTitle: { id: 'lists.new.edit_title_placeholder', defaultMessage: 'Edit list title' },
+})
export default
@connect(mapStateToProps, mapDispatchToProps)
@@ -32,6 +43,7 @@ export default
class ListEdit extends ImmutablePureComponent {
static propTypes = {
+ title: PropTypes.string,
listId: PropTypes.string.isRequired,
onClose: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
@@ -39,63 +51,79 @@ class ListEdit extends ImmutablePureComponent {
onReset: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.list.isRequired,
searchAccountIds: ImmutablePropTypes.list.isRequired,
- };
+ }
componentDidMount() {
- const { onInitialize, listId } = this.props;
- if (listId) onInitialize(listId);
+ const { onInitialize, listId } = this.props
+ console.log("listId:", listId)
+ if (listId) {
+ onInitialize(listId)
+ }
}
componentWillUnmount() {
- this.props.onReset();
+ this.props.onReset()
}
onClickClose = () => {
- this.props.onClose('LIST_ADDER');
- };
+ this.props.onClose('LIST_ADDER')
+ }
render() {
- const { accountIds, searchAccountIds, intl } = this.props;
+ const {
+ title,
+ accountIds,
+ searchAccountIds,
+ intl
+ } = this.props
+
+ console.log("title:", title)
return (
+
+ {
+ /*
+
+
+ {intl.formatMessage(messages.editList)}
+
+
+
+
+
+
+
+
+ {
+ accountIds.size > 0 &&
+
+
+ {accountIds.map(accountId =>
)}
+
+
+ }
+
+
+
+
+ {searchAccountIds.map(accountId =>
)}
+
+
+
+ */ }
+
)
- // return (
- //
- //
- //
- // {intl.formatMessage(messages.editList)}
- //
- //
- //
- //
- //
- //
- //
-
- // {
- // accountIds.size > 0 &&
- //
- //
- // {accountIds.map(accountId =>
)}
- //
- //
- // }
-
- //
- //
- //
- // {searchAccountIds.map(accountId =>
)}
- //
- //
- //
- //
- // );
}
}
diff --git a/app/javascript/gabsocial/features/lists_directory.js b/app/javascript/gabsocial/features/lists_directory.js
index a8c45882..cdada262 100644
--- a/app/javascript/gabsocial/features/lists_directory.js
+++ b/app/javascript/gabsocial/features/lists_directory.js
@@ -60,7 +60,7 @@ class ListsDirectory extends ImmutablePureComponent {
const emptyMessage = intl.formatMessage(messages.empty)
const listItems = lists.map(list => ({
- to: `/list/${list.get('id')}`,
+ to: `/lists/${list.get('id')}`,
title: list.get('title'),
}))
diff --git a/app/javascript/gabsocial/features/notifications/components/column_settings/column_settings.js b/app/javascript/gabsocial/features/notifications/components/column_settings/column_settings.js
deleted file mode 100644
index ccd0c3a4..00000000
--- a/app/javascript/gabsocial/features/notifications/components/column_settings/column_settings.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { FormattedMessage } from 'react-intl';
-import ColumnHeaderSettingButton from '../../../../components/column_header_setting_button';
-import SettingSwitch from '../../../../components/setting_switch';
-
-export default class ColumnSettings extends ImmutablePureComponent {
-
- static propTypes = {
- settings: ImmutablePropTypes.map.isRequired,
- pushSettings: ImmutablePropTypes.map.isRequired,
- onChange: PropTypes.func.isRequired,
- onClear: PropTypes.func.isRequired,
- };
-
- onPushChange = (path, checked) => {
- this.props.onChange(['push', ...path], checked);
- }
-
- render() {
- const { settings, pushSettings, onChange, onClear } = this.props;
-
- const filterShowStr =
;
- const filterAdvancedStr =
;
- const alertStr =
;
- const showStr =
;
- const soundStr =
;
-
- const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
- const pushStr = showPushSettings &&
;
-
- return (
-
-
}
- icon='eraser'
- />
-
-
-
-
-
-
-
-
-
-
- {showPushSettings && }
-
-
-
-
-
-
-
- {showPushSettings && }
-
-
-
-
-
-
-
- {showPushSettings && }
-
-
-
-
-
-
-
- {showPushSettings && }
-
-
-
-
-
-
-
- {showPushSettings && }
-
-
-
-
- );
- }
-
-}
diff --git a/app/javascript/gabsocial/features/notifications/components/column_settings/index.js b/app/javascript/gabsocial/features/notifications/components/column_settings/index.js
deleted file mode 100644
index fc57fdd8..00000000
--- a/app/javascript/gabsocial/features/notifications/components/column_settings/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './column_settings'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/index.js b/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/index.js
deleted file mode 100644
index aaa76ff8..00000000
--- a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './notification_filter_bar'
\ No newline at end of file
diff --git 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
deleted file mode 100644
index c2234de3..00000000
--- a/app/javascript/gabsocial/features/notifications/components/notification_filter_bar/notification_filter_bar.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-const messages = defineMessages({
- mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
- favorites: { id: 'notifications.filter.favorites', defaultMessage: 'Favorites' },
- boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' },
- polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
- follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
- filterAll: { id: 'notifications.filter.all', defaultMessage: 'All' },
- filterMentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
-});
-
-export default
-@injectIntl
-class NotificationFilterBar extends PureComponent {
-
- static propTypes = {
- selectFilter: PropTypes.func.isRequired,
- selectedFilter: PropTypes.string.isRequired,
- advancedMode: PropTypes.bool.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- onClick (notificationType) {
- return () => this.props.selectFilter(notificationType);
- }
-
- render () {
- const { selectedFilter, advancedMode, intl } = this.props;
-
- if (!advancedMode) {
- return (
- { /*
*/ }
- )
- }
-
- return (
-
- )
-
- /*
*/
- }
-
-}
diff --git a/app/javascript/gabsocial/features/notifications/containers/column_settings_container.js b/app/javascript/gabsocial/features/notifications/containers/column_settings_container.js
index 16e7822f..cea03a77 100644
--- a/app/javascript/gabsocial/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/gabsocial/features/notifications/containers/column_settings_container.js
@@ -16,6 +16,7 @@ const mapStateToProps = state => ({
pushSettings: state.get('push_notifications'),
});
+// : todo : put all notification settings actually IN settings
const mapDispatchToProps = (dispatch, { intl }) => ({
onChange (path, checked) {
diff --git a/app/javascript/gabsocial/features/notifications/containers/filter_bar_container.js b/app/javascript/gabsocial/features/notifications/containers/filter_bar_container.js
deleted file mode 100644
index 64765700..00000000
--- a/app/javascript/gabsocial/features/notifications/containers/filter_bar_container.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { setFilter } from '../../../actions/notifications';
-import FilterBar from '../components/notification_filter_bar';
-
-const makeMapStateToProps = state => ({
- selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
- advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']),
-});
-
-const mapDispatchToProps = (dispatch) => ({
- selectFilter (newActiveFilter) {
- dispatch(setFilter(newActiveFilter));
- },
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(FilterBar);
diff --git a/app/javascript/gabsocial/features/ui/ui.js b/app/javascript/gabsocial/features/ui/ui.js
index f2fe011a..8af2f6be 100644
--- a/app/javascript/gabsocial/features/ui/ui.js
+++ b/app/javascript/gabsocial/features/ui/ui.js
@@ -165,7 +165,7 @@ class SwitchingArea extends PureComponent {
-
+
diff --git a/app/javascript/gabsocial/layouts/default_layout.js b/app/javascript/gabsocial/layouts/default_layout.js
index dad9e6dd..7535a799 100644
--- a/app/javascript/gabsocial/layouts/default_layout.js
+++ b/app/javascript/gabsocial/layouts/default_layout.js
@@ -5,6 +5,7 @@ import ColumnHeader from '../components/column_header'
import Sidebar from '../components/sidebar'
// import Header from '../components/header'
// import Footer from '../components/footer'
+import FloatingActionButton from '../components/floating_action_button'
import Responsive from '../features/ui/util/responsive_component'
export default class DefaultLayout extends PureComponent {
@@ -19,9 +20,6 @@ export default class DefaultLayout extends PureComponent {
render() {
const { children, title, showBackBtn, layout, actions, tabs } = this.props
- // const shouldHideFAB = path => path.match(/^\/posts\/|^\/search|^\/getting-started/);
- // const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null :
;
-
console.log("Constants.BREAKPOINT_EXTRA_SMALL:", Constants.BREAKPOINT_EXTRA_SMALL)
return (
@@ -43,9 +41,11 @@ export default class DefaultLayout extends PureComponent {
tabs={tabs}
/>