kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Purge unused getting_started feature
Alex Gleason
rodzic
e8ecc9afc0
commit
23cc622dab
|
|
@ -1,158 +0,0 @@
|
||||||
import React from 'react';
|
|
||||||
import Column from '../ui/components/column';
|
|
||||||
import ColumnLink from '../ui/components/column_link';
|
|
||||||
import ColumnSubheading from '../ui/components/column_subheading';
|
|
||||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
|
||||||
import { connect } from 'react-redux';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
||||||
import { fetchFollowRequests } from 'soapbox/actions/accounts';
|
|
||||||
import { List as ImmutableList } from 'immutable';
|
|
||||||
import NavigationBar from '../compose/components/navigation_bar';
|
|
||||||
import Icon from 'soapbox/components/icon';
|
|
||||||
import LinkFooter from 'soapbox/features/ui/components/link_footer';
|
|
||||||
|
|
||||||
const messages = defineMessages({
|
|
||||||
home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
|
|
||||||
notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
|
|
||||||
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
|
|
||||||
direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
|
|
||||||
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
|
|
||||||
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
|
|
||||||
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Likes' },
|
|
||||||
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
|
|
||||||
domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
|
|
||||||
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
|
|
||||||
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
|
|
||||||
lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
|
|
||||||
discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
|
|
||||||
personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
|
|
||||||
security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
|
|
||||||
menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
|
|
||||||
});
|
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
|
||||||
const me = state.get('me');
|
|
||||||
return {
|
|
||||||
myAccount: state.getIn(['accounts', me]),
|
|
||||||
unreadFollowRequests: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const mapDispatchToProps = dispatch => ({
|
|
||||||
fetchFollowRequests: () => dispatch(fetchFollowRequests()),
|
|
||||||
});
|
|
||||||
|
|
||||||
const badgeDisplay = (number, limit) => {
|
|
||||||
if (number === 0) {
|
|
||||||
return undefined;
|
|
||||||
} else if (limit && number >= limit) {
|
|
||||||
return `${limit}+`;
|
|
||||||
} else {
|
|
||||||
return number;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
|
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class GettingStarted extends ImmutablePureComponent {
|
|
||||||
|
|
||||||
static contextTypes = {
|
|
||||||
router: PropTypes.object.isRequired,
|
|
||||||
};
|
|
||||||
|
|
||||||
static propTypes = {
|
|
||||||
intl: PropTypes.object.isRequired,
|
|
||||||
myAccount: ImmutablePropTypes.map.isRequired,
|
|
||||||
columns: ImmutablePropTypes.list,
|
|
||||||
multiColumn: PropTypes.bool,
|
|
||||||
fetchFollowRequests: PropTypes.func.isRequired,
|
|
||||||
unreadFollowRequests: PropTypes.number,
|
|
||||||
unreadNotifications: PropTypes.number,
|
|
||||||
};
|
|
||||||
|
|
||||||
componentDidMount() {
|
|
||||||
const { myAccount, fetchFollowRequests, multiColumn } = this.props;
|
|
||||||
|
|
||||||
if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
|
|
||||||
this.context.router.history.replace('/');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (myAccount.get('locked')) {
|
|
||||||
fetchFollowRequests();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
const { intl, myAccount, multiColumn, unreadFollowRequests } = this.props;
|
|
||||||
|
|
||||||
const navItems = [];
|
|
||||||
let i = 1;
|
|
||||||
let height = (multiColumn) ? 0 : 60;
|
|
||||||
|
|
||||||
if (multiColumn) {
|
|
||||||
navItems.push(
|
|
||||||
<ColumnSubheading key={i++} text={intl.formatMessage(messages.discover)} />,
|
|
||||||
);
|
|
||||||
|
|
||||||
height += 34 + 48*2;
|
|
||||||
|
|
||||||
navItems.push(
|
|
||||||
<ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} />,
|
|
||||||
);
|
|
||||||
|
|
||||||
height += 34;
|
|
||||||
}
|
|
||||||
|
|
||||||
navItems.push(
|
|
||||||
<ColumnLink key={i++} icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
|
|
||||||
<ColumnLink key={i++} icon='star' text={intl.formatMessage(messages.favourites)} to='/favorites' />,
|
|
||||||
<ColumnLink key={i++} icon='list-ul' text={intl.formatMessage(messages.lists)} to='/lists' />,
|
|
||||||
);
|
|
||||||
|
|
||||||
height += 48*3;
|
|
||||||
|
|
||||||
if (myAccount.get('locked')) {
|
|
||||||
navItems.push(<ColumnLink key={i++} icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
|
|
||||||
height += 48;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!multiColumn) {
|
|
||||||
navItems.push(
|
|
||||||
<ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />,
|
|
||||||
<ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
|
|
||||||
);
|
|
||||||
|
|
||||||
height += 34 + 48;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Column label={intl.formatMessage(messages.menu)}>
|
|
||||||
{multiColumn && <div className='column-header__wrapper'>
|
|
||||||
<h1 className='column-header'>
|
|
||||||
<button>
|
|
||||||
<Icon id='bars' className='column-header__icon' fixedWidth />
|
|
||||||
<FormattedMessage id='getting_started.heading' defaultMessage='Getting started' />
|
|
||||||
</button>
|
|
||||||
</h1>
|
|
||||||
</div>}
|
|
||||||
|
|
||||||
<div className='getting-started'>
|
|
||||||
<div className='getting-started__wrapper' style={{ height }}>
|
|
||||||
{!multiColumn && <NavigationBar account={myAccount} />}
|
|
||||||
{navItems}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{!multiColumn && <div className='flex-spacer' />}
|
|
||||||
|
|
||||||
<LinkFooter withHotkeys={multiColumn} />
|
|
||||||
</div>
|
|
||||||
</Column>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -43,7 +43,6 @@ import ProfileHoverCard from 'soapbox/components/profile_hover_card';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Status,
|
Status,
|
||||||
// GettingStarted,
|
|
||||||
CommunityTimeline,
|
CommunityTimeline,
|
||||||
PublicTimeline,
|
PublicTimeline,
|
||||||
RemoteTimeline,
|
RemoteTimeline,
|
||||||
|
|
|
||||||
|
|
@ -74,10 +74,6 @@ export function Status() {
|
||||||
return import(/* webpackChunkName: "features/status" */'../../status');
|
return import(/* webpackChunkName: "features/status" */'../../status');
|
||||||
}
|
}
|
||||||
|
|
||||||
export function GettingStarted() {
|
|
||||||
return import(/* webpackChunkName: "features/getting_started" */'../../getting_started');
|
|
||||||
}
|
|
||||||
|
|
||||||
export function PinnedStatuses() {
|
export function PinnedStatuses() {
|
||||||
return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses');
|
return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue