bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused code

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-08-24 14:40:06 +02:00
parent dd1fe0917b
commit 6ace7722a6
2 changed files with 12 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/features/ui/components/columns-area.tsx
View file

@ -1,31 +0,0 @@
import React from 'react';
import { Layout } from '../../../components/ui';
interface IColumnsArea {
layout: any;
children: React.ReactNode;
}
const ColumnsArea: React.FC<IColumnsArea> = (props) => {
const { children } = props;
const layout = props.layout || { LEFT: null, RIGHT: null };
return (
<Layout>
<Layout.Sidebar>
{layout.LEFT}
</Layout.Sidebar>
<Layout.Main>
{children}
</Layout.Main>
<Layout.Aside>
{layout.RIGHT}
</Layout.Aside>
</Layout>
);
};
export { ColumnsArea as default };

44
src/features/ui/util/react-router-helpers.tsx
View file

@ -7,21 +7,18 @@ import { useOwnAccount, useSettings } from 'soapbox/hooks';
import ColumnForbidden from '../components/column-forbidden';
import ColumnLoading from '../components/column-loading';
import ColumnsArea from '../components/columns-area';
import ErrorColumn from '../components/error-column';
type PageProps = {
params?: MatchType['params'];
layout?: any;
children: React.ReactNode;
};
interface IWrappedRoute extends RouteProps {
component: React.LazyExoticComponent<any>;
page?: React.ComponentType<PageProps>;
page: React.ComponentType<PageProps>;
content?: React.ReactNode;
componentParams?: Record<string, any>;
layout?: any;
publicRoute?: boolean;
staffOnly?: boolean;
adminOnly?: boolean;
@ -33,7 +30,6 @@ const WrappedRoute: React.FC<IWrappedRoute> = ({
page: Page,
content,
componentParams = {},
layout,
publicRoute = false,
staffOnly = false,
adminOnly = false,
@ -45,33 +41,17 @@ const WrappedRoute: React.FC<IWrappedRoute> = ({
const { account } = useOwnAccount();
const { isDeveloper } = useSettings();
const renderComponent = ({ match }: RouteComponentProps) => {
if (Page) {
return (
<ErrorBoundary FallbackComponent={FallbackError}>
<Suspense fallback={<FallbackLoading />}>
<Page params={match.params} layout={layout} {...componentParams}>
<Component params={match.params} {...componentParams}>
{content}
</Component>
</Page>
</Suspense>
</ErrorBoundary>
);
}
return (
<ErrorBoundary FallbackComponent={FallbackError}>
<Suspense fallback={<FallbackLoading />}>
<ColumnsArea layout={layout}>
<Component params={match.params} {...componentParams}>
{content}
</Component>
</ColumnsArea>
</Suspense>
</ErrorBoundary>
);
};
const renderComponent = ({ match }: RouteComponentProps) => (
<ErrorBoundary FallbackComponent={FallbackError}>
<Suspense fallback={<FallbackLoading />}>
<Page params={match.params} {...componentParams}>
<Component params={match.params} {...componentParams}>
{content}
</Component>
</Page>
</Suspense>
</ErrorBoundary>
);
const loginRedirect = () => {
const actualUrl = encodeURIComponent(`${history.location.pathname}${history.location.search}`);