Merge branch 'small-details-zap-split-polish' into 'main'

refactor: only display zap-split if backend has nostr, rename...

See merge request soapbox-pub/soapbox!3212
fix-build-warnings
Alex Gleason 2024-11-07 00:16:17 +00:00
commit cdcf29062b
3 zmienionych plików z 12 dodań i 10 usunięć

Wyświetl plik

@ -94,10 +94,12 @@ const Dashboard: React.FC = () => {
label={<FormattedMessage id='column.admin.moderation_log' defaultMessage='Moderation Log' />}
/>
<ListItem
to='/soapbox/admin/zap-split'
label={<FormattedMessage id='column.admin.zap_split' defaultMessage='Manage Zap Split' />}
/>
{features.nostr && (
<ListItem
to='/soapbox/admin/zap-split'
label={<FormattedMessage id='column.admin.zap_split' defaultMessage='Manage Zap Split' />}
/>
)}
{features.adminAnnouncements && (
<ListItem

Wyświetl plik

@ -29,11 +29,11 @@ import GroupsPendingPage from 'soapbox/pages/groups-pending-page';
import HomePage from 'soapbox/pages/home-page';
import LandingPage from 'soapbox/pages/landing-page';
import ManageGroupsPage from 'soapbox/pages/manage-groups-page';
import ManageZapSplitPage from 'soapbox/pages/manage-zap-split-page';
import ProfilePage from 'soapbox/pages/profile-page';
import RemoteInstancePage from 'soapbox/pages/remote-instance-page';
import SearchPage from 'soapbox/pages/search-page';
import StatusPage from 'soapbox/pages/status-page';
import WidePage from 'soapbox/pages/wide-page';
import BackgroundShapes from './components/background-shapes';
import FloatingActionButton from './components/floating-action-button';
@ -331,7 +331,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
<WrappedRoute path='/soapbox/admin/approval' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
<WrappedRoute path='/soapbox/admin/reports' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
<WrappedRoute path='/soapbox/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact />
<WrappedRoute path='/soapbox/admin/zap-split' staffOnly page={ManageZapSplitPage} component={ManageZapSplit} content={children} exact />
{features.nostr && <WrappedRoute path='/soapbox/admin/zap-split' staffOnly page={WidePage} component={ManageZapSplit} content={children} exact />}
<WrappedRoute path='/soapbox/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact />
<WrappedRoute path='/soapbox/admin/theme' staffOnly page={AdminPage} component={ThemeEditor} content={children} exact />
<WrappedRoute path='/soapbox/admin/relays' staffOnly page={AdminPage} component={Relays} content={children} exact />

Wyświetl plik

@ -1,11 +1,11 @@
import React from 'react';
interface IManageZapSplitPage {
interface IWidePage {
children: React.ReactNode;
}
/** Custom layout for Manage Zap Split on desktop. */
const ManageZapSplitPage: React.FC<IManageZapSplitPage> = ({ children }) => {
/** Wide page without any side components. */
const WidePage: React.FC<IWidePage> = ({ children }) => {
return (
<div className='black:border-gray-800 md:col-span-12 lg:col-span-9 lg:black:border-l'>
{children}
@ -13,4 +13,4 @@ const ManageZapSplitPage: React.FC<IManageZapSplitPage> = ({ children }) => {
);
};
export default ManageZapSplitPage;
export default WidePage;