Use to="" links for settings pages

This commit is contained in:
Alex Gleason 2020-04-21 16:20:17 -05:00
parent 68f36685b7
commit aa47b35503
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 8 additions and 12 deletions

View File

@ -117,10 +117,10 @@ class SidebarMenu extends ImmutablePureComponent {
<Icon id='envelope' /> <Icon id='envelope' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.messages)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.messages)}</span>
</NavLink> </NavLink>
<a className='sidebar-menu-item' href='/donate' onClick={onClose}> <NavLink className='sidebar-menu-item' to='/donate' onClick={onClose}>
<Icon id='dollar' /> <Icon id='dollar' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span>
</a> </NavLink>
<NavLink className='sidebar-menu-item' to='/lists' onClick={onClose}> <NavLink className='sidebar-menu-item' to='/lists' onClick={onClose}>
<Icon id='list' /> <Icon id='list' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.lists)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.lists)}</span>
@ -144,14 +144,14 @@ class SidebarMenu extends ImmutablePureComponent {
<Icon id='times-circle' /> <Icon id='times-circle' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.mutes)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.mutes)}</span>
</NavLink> </NavLink>
<a className='sidebar-menu-item' href='/filters'> <NavLink className='sidebar-menu-item' to='/filters' onClick={onClose}>
<Icon id='filter' /> <Icon id='filter' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.filters)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.filters)}</span>
</a> </NavLink>
<a className='sidebar-menu-item' href='/settings/preferences'> <NavLink className='sidebar-menu-item' to='/settings/preferences' onClick={onClose}>
<Icon id='cog' /> <Icon id='cog' />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span>
</a> </NavLink>
</div> </div>
<div className='sidebar-menu__section'> <div className='sidebar-menu__section'>

View File

@ -80,10 +80,6 @@ class Header extends ImmutablePureComponent {
isSmallScreen: (window.innerWidth <= 895), isSmallScreen: (window.innerWidth <= 895),
} }
openEditProfile = () => {
window.open('/settings/profile', '_blank');
}
isStatusesPageActive = (match, location) => { isStatusesPageActive = (match, location) => {
if (!match) { if (!match) {
return false; return false;
@ -121,8 +117,8 @@ class Header extends ImmutablePureComponent {
} }
if (account.get('id') === me) { if (account.get('id') === me) {
menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' }); menu.push({ text: intl.formatMessage(messages.edit_profile), to: '/settings/profile' });
menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' }); menu.push({ text: intl.formatMessage(messages.preferences), to: '/settings/preferences' });
menu.push(null); menu.push(null);
menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' }); menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
menu.push(null); menu.push(null);