mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

RemoteInstancePage: use standard navigation like other pages

profile-avatar-switcher
Alex Gleason 2021-10-08 16:35:47 -05:00
rodzic b029225236
commit 0bc1a57cfa
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
1 zmienionych plików z 23 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

39
app/soapbox/pages/remote_instance_page.js
Wyświetl plik

@ -1,7 +1,9 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import Sticky from 'react-stickynode';
import BundleContainer from 'soapbox/features/ui/containers/bundle_container'; import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
import PrimaryNavigation from 'soapbox/components/primary_navigation';
import { import {
PromoPanel, PromoPanel,
FeaturesPanel, FeaturesPanel,
@ -36,14 +38,9 @@ class RemoteInstancePage extends ImmutablePureComponent {
<div className='columns-area__panels__pane columns-area__panels__pane--left'> <div className='columns-area__panels__pane columns-area__panels__pane--left'>
<div className='columns-area__panels__pane__inner'> <div className='columns-area__panels__pane__inner'>
<BundleContainer fetchComponent={InstanceInfoPanel}> <Sticky top={65}>
{Component => <Component host={host} />} <PrimaryNavigation />
</BundleContainer> </Sticky>
{(disclosed || isAdmin) && (
<BundleContainer fetchComponent={InstanceModerationPanel}>
{Component => <Component host={host} />}
</BundleContainer>
)}
</div> </div>
</div> </div>
@ -55,15 +52,25 @@ class RemoteInstancePage extends ImmutablePureComponent {
<div className='columns-area__panels__pane columns-area__panels__pane--right'> <div className='columns-area__panels__pane columns-area__panels__pane--right'>
<div className='columns-area__panels__pane__inner'> <div className='columns-area__panels__pane__inner'>
{me && ( <Sticky top={65}>
<BundleContainer fetchComponent={FeaturesPanel}> {me && (
{Component => <Component key='features-panel' />} <BundleContainer fetchComponent={FeaturesPanel}>
{Component => <Component key='features-panel' />}
</BundleContainer>
)}
<BundleContainer fetchComponent={PromoPanel}>
{Component => <Component key='promo-panel' />}
</BundleContainer> </BundleContainer>
)} <BundleContainer fetchComponent={InstanceInfoPanel}>
<BundleContainer fetchComponent={PromoPanel}> {Component => <Component host={host} />}
{Component => <Component key='promo-panel' />} </BundleContainer>
</BundleContainer> {(disclosed || isAdmin) && (
<LinkFooter key='link-footer' /> <BundleContainer fetchComponent={InstanceModerationPanel}>
{Component => <Component host={host} />}
</BundleContainer>
)}
<LinkFooter key='link-footer' />
</Sticky>
</div> </div>
</div> </div>
</div> </div>