Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/client/src/application/Application.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,16 @@ export class Application {

get adminUrl() {
if (this.name === 'main') {
return '/admin/';
return `/${this.prefix}/`;
} else {
return `/apps/${this.name}/admin/`;
return `/apps/${this.name}/${this.prefix}/`;
}
}

get prefix() {
return 'dashboard';
}

constructor(protected options: ApplicationOptions = {}) {
this.initRequireJs();
define(this, {
Expand Down
275 changes: 0 additions & 275 deletions packages/client/src/application/CustomRouterContextProvider.tsx

This file was deleted.

15 changes: 6 additions & 9 deletions packages/client/src/application/RouterManager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {
import VariablesProvider from '../variables/VariablesProvider';
import { Application } from './Application';
import { BlankComponent, RouterContextCleaner } from './components';
import { CustomRouterContextProvider } from './CustomRouterContextProvider';

export interface BrowserRouterOptions extends Omit<BrowserRouterProps, 'children'> {
type?: 'browser';
Expand Down Expand Up @@ -146,14 +145,12 @@ export class RouterManager {
const Provider = () => {
const BaseLayout = useContext(BaseLayoutContext);
return (
<CustomRouterContextProvider>
<BaseLayout>
<VariablesProvider>
<Outlet />
{children}
</VariablesProvider>
</BaseLayout>
</CustomRouterContextProvider>
<BaseLayout>
<VariablesProvider>
<Outlet />
{children}
</VariablesProvider>
</BaseLayout>
);
};

Expand Down
Loading