Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
robcolbert 2019-07-03 12:08:00 -04:00
commit ddae395f91
3 changed files with 26 additions and 8 deletions

View File

@ -47,7 +47,7 @@ export default class ActionsModal extends ImmutablePureComponent {
</a> </a>
</div> </div>
<a href={`/${status.getIn(['account', 'acct'])}`} className='status__display-name'> <a href={`/${this.props.status.getIn(['account', 'acct'])}`} className='status__display-name'>
<div className='status__avatar'> <div className='status__avatar'>
<Avatar account={this.props.status.get('account')} size={48} /> <Avatar account={this.props.status.get('account')} size={48} />
</div> </div>

View File

@ -182,7 +182,7 @@ class SwitchingColumnsArea extends React.PureComponent {
return ( return (
<Switch> <Switch>
<Redirect from='/' to='/home' exact /> {/* <Redirect from='/' to='/home' exact /> */}
<WrappedRoute path='/home' exact layout={LAYOUT.HOME} component={HomeTimeline} content={children} /> <WrappedRoute path='/home' exact layout={LAYOUT.HOME} component={HomeTimeline} content={children} />
<WrappedRoute path='/groups' component={Groups} content={children} /> <WrappedRoute path='/groups' component={Groups} content={children} />

View File

@ -42,12 +42,30 @@ self.addEventListener('fetch', function(event) {
return response; return response;
})); }));
} else if ( } else if (
url.pathname.startsWith('/system/') || url.pathname.startsWith('/system') ||
url.pathname.startsWith('/api/') || url.pathname.startsWith('/api') ||
url.pathname.startsWith('/settings/') || url.pathname.startsWith('/settings') ||
url.pathname.startsWith('/media/') || url.pathname.startsWith('/media') ||
url.pathname.startsWith('/admin/') || url.pathname.startsWith('/admin') ||
url.pathname.startsWith('/about/')) { url.pathname.startsWith('/about') ||
url.pathname.startsWith('/auth') ||
url.pathname.startsWith('/oauth') ||
url.pathname.startsWith('/invites') ||
url.pathname.startsWith('/pghero') ||
url.pathname.startsWith('/sidekiq') ||
url.pathname.startsWith('/filters') ||
url.pathname.startsWith('/tags') ||
url.pathname.startsWith('/emojis') ||
url.pathname.startsWith('/inbox') ||
url.pathname.startsWith('/accounts') ||
url.pathname.startsWith('/user') ||
url.pathname.startsWith('/users') ||
url.pathname.startsWith('/src') ||
url.pathname.startsWith('/public') ||
url.pathname.startsWith('/avatars') ||
url.pathname.startsWith('/authorize_follow') ||
url.pathname.startsWith('/media_proxy') ||
url.pathname.startsWith('/relationships')) {
//non-webapp routes //non-webapp routes
} else if (url.pathname.startsWith('/')) { } else if (url.pathname.startsWith('/')) {
// : TODO : if is /web // : TODO : if is /web