Browse Source

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

develop
robcolbert 2 years ago
parent
commit
ddae395f91
3 changed files with 26 additions and 8 deletions
  1. +1
    -1
      app/javascript/gabsocial/features/ui/components/actions_modal.js
  2. +1
    -1
      app/javascript/gabsocial/features/ui/index.js
  3. +24
    -6
      app/javascript/gabsocial/service_worker/entry.js

+ 1
- 1
app/javascript/gabsocial/features/ui/components/actions_modal.js View File

@ -47,7 +47,7 @@ export default class ActionsModal extends ImmutablePureComponent {
</a>
</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'>
<Avatar account={this.props.status.get('account')} size={48} />
</div>


+ 1
- 1
app/javascript/gabsocial/features/ui/index.js View File

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


+ 24
- 6
app/javascript/gabsocial/service_worker/entry.js View File

@ -42,12 +42,30 @@ self.addEventListener('fetch', function(event) {
return response;
}));
} else if (
url.pathname.startsWith('/system/') ||
url.pathname.startsWith('/api/') ||
url.pathname.startsWith('/settings/') ||
url.pathname.startsWith('/media/') ||
url.pathname.startsWith('/admin/') ||
url.pathname.startsWith('/about/')) {
url.pathname.startsWith('/system') ||
url.pathname.startsWith('/api') ||
url.pathname.startsWith('/settings') ||
url.pathname.startsWith('/media') ||
url.pathname.startsWith('/admin') ||
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
} else if (url.pathname.startsWith('/')) {
// : TODO : if is /web


Loading…
Cancel
Save