Revert "feat(#112): hide sidebar, topbar, cmd palette on admin pages"
This reverts commit d95e518622.
This commit is contained in:
@@ -296,33 +296,29 @@ function LayoutContent() {
|
|||||||
return (
|
return (
|
||||||
<AppShell
|
<AppShell
|
||||||
sidebar={
|
sidebar={
|
||||||
isAdminPage ? null : <Sidebar apps={sidebarApps} onNavigate={handleSidebarNavigate} />
|
<Sidebar apps={sidebarApps} onNavigate={handleSidebarNavigate} />
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{!isAdminPage && (
|
<TopBar
|
||||||
<TopBar
|
breadcrumb={breadcrumb}
|
||||||
breadcrumb={breadcrumb}
|
user={username ? { name: username } : undefined}
|
||||||
user={username ? { name: username } : undefined}
|
onLogout={handleLogout}
|
||||||
onLogout={handleLogout}
|
/>
|
||||||
/>
|
<CommandPalette
|
||||||
)}
|
open={paletteOpen}
|
||||||
{!isAdminPage && (
|
onClose={() => setPaletteOpen(false)}
|
||||||
<CommandPalette
|
onOpen={() => setPaletteOpen(true)}
|
||||||
open={paletteOpen}
|
onSelect={handlePaletteSelect}
|
||||||
onClose={() => setPaletteOpen(false)}
|
onSubmit={handlePaletteSubmit}
|
||||||
onOpen={() => setPaletteOpen(true)}
|
onQueryChange={setPaletteQuery}
|
||||||
onSelect={handlePaletteSelect}
|
data={searchData}
|
||||||
onSubmit={handlePaletteSubmit}
|
/>
|
||||||
onQueryChange={setPaletteQuery}
|
|
||||||
data={searchData}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isAdminPage && (
|
{!isAdminPage && (
|
||||||
<ContentTabs active={scope.tab} onChange={setTab} scope={scope} />
|
<ContentTabs active={scope.tab} onChange={setTab} scope={scope} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<main style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden', minHeight: 0, padding: 0 }}>
|
<main style={{ flex: 1, display: 'flex', flexDirection: 'column', overflow: 'hidden', minHeight: 0, padding: isAdminPage ? '1.5rem' : 0 }}>
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</main>
|
</main>
|
||||||
</AppShell>
|
</AppShell>
|
||||||
|
|||||||
Reference in New Issue
Block a user