[Glitch] Remove profile directory link from main navigation panel
Port 54d4ece743 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
			
			
This commit is contained in:
		
							parent
							
								
									6e208a817d
								
							
						
					
					
						commit
						c1fbef0965
					
				| 
						 | 
					@ -8,7 +8,7 @@ import { openModal } from 'flavours/glitch/actions/modal';
 | 
				
			||||||
import PropTypes from 'prop-types';
 | 
					import PropTypes from 'prop-types';
 | 
				
			||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
					import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
				
			||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
					import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
				
			||||||
import { me, profile_directory, showTrends } from 'flavours/glitch/util/initial_state';
 | 
					import { me, showTrends } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
 | 
					import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
 | 
				
			||||||
import { List as ImmutableList } from 'immutable';
 | 
					import { List as ImmutableList } from 'immutable';
 | 
				
			||||||
import { createSelector } from 'reselect';
 | 
					import { createSelector } from 'reselect';
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,6 @@ const messages = defineMessages({
 | 
				
			||||||
  lists_subheading: { id: 'column_subheading.lists', defaultMessage: 'Lists' },
 | 
					  lists_subheading: { id: 'column_subheading.lists', defaultMessage: 'Lists' },
 | 
				
			||||||
  misc: { id: 'navigation_bar.misc', defaultMessage: 'Misc' },
 | 
					  misc: { id: 'navigation_bar.misc', defaultMessage: 'Misc' },
 | 
				
			||||||
  menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
 | 
					  menu: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
 | 
				
			||||||
  profile_directory: { id: 'getting_started.directory', defaultMessage: 'Profile directory' },
 | 
					 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const makeMapStateToProps = () => {
 | 
					const makeMapStateToProps = () => {
 | 
				
			||||||
| 
						 | 
					@ -150,10 +149,6 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
 | 
				
			||||||
      navItems.push(<ColumnLink key='6' icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
 | 
					      navItems.push(<ColumnLink key='6' icon='user-plus' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (profile_directory) {
 | 
					 | 
				
			||||||
      navItems.push(<ColumnLink key='7' icon='address-book' text={intl.formatMessage(messages.profile_directory)} to='/directory' />);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    navItems.push(<ColumnLink key='8' icon='ellipsis-h' text={intl.formatMessage(messages.misc)} to='/getting-started-misc' />);
 | 
					    navItems.push(<ColumnLink key='8' icon='ellipsis-h' text={intl.formatMessage(messages.misc)} to='/getting-started-misc' />);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    listItems = listItems.concat([
 | 
					    listItems = listItems.concat([
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ import React from 'react';
 | 
				
			||||||
import PropTypes from 'prop-types';
 | 
					import PropTypes from 'prop-types';
 | 
				
			||||||
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 | 
					import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 | 
				
			||||||
import { Link } from 'react-router-dom';
 | 
					import { Link } from 'react-router-dom';
 | 
				
			||||||
import { limitedFederationMode, version, repository, source_url } from 'flavours/glitch/util/initial_state';
 | 
					import { limitedFederationMode, version, repository, source_url, profile_directory as profileDirectory } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
import { signOutLink, securityLink, privacyPolicyLink } from 'flavours/glitch/util/backend_links';
 | 
					import { signOutLink, securityLink, privacyPolicyLink } from 'flavours/glitch/util/backend_links';
 | 
				
			||||||
import { logOut } from 'flavours/glitch/util/log_out';
 | 
					import { logOut } from 'flavours/glitch/util/log_out';
 | 
				
			||||||
import { openModal } from 'flavours/glitch/actions/modal';
 | 
					import { openModal } from 'flavours/glitch/actions/modal';
 | 
				
			||||||
| 
						 | 
					@ -54,6 +54,7 @@ class LinkFooter extends React.PureComponent {
 | 
				
			||||||
          {((this.context.identity.permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS) && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
 | 
					          {((this.context.identity.permissions & PERMISSION_INVITE_USERS) === PERMISSION_INVITE_USERS) && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> · </li>}
 | 
				
			||||||
          {!!securityLink && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>}
 | 
					          {!!securityLink && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>}
 | 
				
			||||||
          {!limitedFederationMode && <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>}
 | 
					          {!limitedFederationMode && <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>}
 | 
				
			||||||
 | 
					          {profileDirectory && <li><Link to='/directory'><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></Link> · </li>}
 | 
				
			||||||
          <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
 | 
					          <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
 | 
				
			||||||
          <li><a href={privacyPolicyLink} target='_blank'><FormattedMessage id='getting_started.privacy_policy' defaultMessage='Privacy Policy' /></a> · </li>
 | 
					          <li><a href={privacyPolicyLink} target='_blank'><FormattedMessage id='getting_started.privacy_policy' defaultMessage='Privacy Policy' /></a> · </li>
 | 
				
			||||||
          <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
 | 
					          <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,7 +2,7 @@ import React from 'react';
 | 
				
			||||||
import { NavLink, withRouter } from 'react-router-dom';
 | 
					import { NavLink, withRouter } from 'react-router-dom';
 | 
				
			||||||
import { FormattedMessage } from 'react-intl';
 | 
					import { FormattedMessage } from 'react-intl';
 | 
				
			||||||
import Icon from 'flavours/glitch/components/icon';
 | 
					import Icon from 'flavours/glitch/components/icon';
 | 
				
			||||||
import { profile_directory, showTrends } from 'flavours/glitch/util/initial_state';
 | 
					import { showTrends } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
import { preferencesLink, relationshipsLink } from 'flavours/glitch/util/backend_links';
 | 
					import { preferencesLink, relationshipsLink } from 'flavours/glitch/util/backend_links';
 | 
				
			||||||
import NotificationsCounterIcon from './notifications_counter_icon';
 | 
					import NotificationsCounterIcon from './notifications_counter_icon';
 | 
				
			||||||
import FollowRequestsNavLink from './follow_requests_nav_link';
 | 
					import FollowRequestsNavLink from './follow_requests_nav_link';
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,6 @@ const NavigationPanel = ({ onOpenSettings }) => (
 | 
				
			||||||
    <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
 | 
					    <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
 | 
				
			||||||
    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
 | 
					    <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
 | 
				
			||||||
    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
 | 
					    <NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
 | 
				
			||||||
    {profile_directory && <NavLink className='column-link column-link--transparent' to='/directory'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></NavLink>}
 | 
					 | 
				
			||||||
    <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
 | 
					    <NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ListPanel />
 | 
					    <ListPanel />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue