* Enhance sidebar navigation and layout configuration - Added support for configurable sidebar collapsed style - Updated layout components to use new sidebar configuration - Added environment variable for sidebar trigger display - Simplified page header and navigation components - Improved sidebar responsiveness and user experience * Refactor admin account page layout and action buttons - Moved action buttons from sidebar to PageHeader for both personal and team account pages - Updated button variants and styling for better visual hierarchy - Improved spacing and layout of account page components - Added border to PageHeader for better visual separation * Update version updater dialog styling - Replaced `space-x-4` with `gap-x-2` for better spacing - Wrapped translation text in a `span` for improved layout - Maintained consistent icon and text alignment in dialog title * Refactor sidebar state management and configuration - Simplified sidebar context and removed minimized state - Updated layout components to use new sidebar open/closed state - Modified sidebar navigation to handle collapsed state dynamically - Added environment variable for sidebar trigger and collapsed style - Improved sidebar responsiveness and rendering logic * Remove sidebar configuration and environment variables - Simplified sidebar context by removing `minimized` state in components - Updated account selector components to use simplified sidebar state - Removed unused helper functions in sidebar implementation
143 lines
4.0 KiB
TypeScript
143 lines
4.0 KiB
TypeScript
import { use } from 'react';
|
|
|
|
import { cookies } from 'next/headers';
|
|
|
|
import { TeamAccountWorkspaceContextProvider } from '@kit/team-accounts/components';
|
|
import {
|
|
Page,
|
|
PageLayoutStyle,
|
|
PageMobileNavigation,
|
|
PageNavigation,
|
|
} from '@kit/ui/page';
|
|
import { SidebarProvider } from '@kit/ui/shadcn-sidebar';
|
|
|
|
import { AppLogo } from '~/components/app-logo';
|
|
import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
|
|
import { withI18n } from '~/lib/i18n/with-i18n';
|
|
|
|
// local imports
|
|
import { TeamAccountLayoutMobileNavigation } from './_components/team-account-layout-mobile-navigation';
|
|
import { TeamAccountLayoutSidebar } from './_components/team-account-layout-sidebar';
|
|
import { TeamAccountNavigationMenu } from './_components/team-account-navigation-menu';
|
|
import { loadTeamWorkspace } from './_lib/server/team-account-workspace.loader';
|
|
|
|
type TeamWorkspaceLayoutProps = React.PropsWithChildren<{
|
|
params: Promise<{ account: string }>;
|
|
}>;
|
|
|
|
function TeamWorkspaceLayout({ children, params }: TeamWorkspaceLayoutProps) {
|
|
const account = use(params).account;
|
|
const state = use(getLayoutState(account));
|
|
|
|
if (state.style === 'sidebar') {
|
|
return <SidebarLayout account={account}>{children}</SidebarLayout>;
|
|
}
|
|
|
|
return <HeaderLayout account={account}>{children}</HeaderLayout>;
|
|
}
|
|
|
|
function SidebarLayout({
|
|
account,
|
|
children,
|
|
}: React.PropsWithChildren<{
|
|
account: string;
|
|
}>) {
|
|
const data = use(loadTeamWorkspace(account));
|
|
const state = use(getLayoutState(account));
|
|
|
|
const accounts = data.accounts.map(({ name, slug, picture_url }) => ({
|
|
label: name,
|
|
value: slug,
|
|
image: picture_url,
|
|
}));
|
|
|
|
return (
|
|
<TeamAccountWorkspaceContextProvider value={data}>
|
|
<SidebarProvider defaultOpen={state.open}>
|
|
<Page style={'sidebar'}>
|
|
<PageNavigation>
|
|
<TeamAccountLayoutSidebar
|
|
account={account}
|
|
accountId={data.account.id}
|
|
accounts={accounts}
|
|
user={data.user}
|
|
/>
|
|
</PageNavigation>
|
|
|
|
<PageMobileNavigation className={'flex items-center justify-between'}>
|
|
<AppLogo />
|
|
|
|
<div className={'flex space-x-4'}>
|
|
<TeamAccountLayoutMobileNavigation
|
|
userId={data.user.id}
|
|
accounts={accounts}
|
|
account={account}
|
|
/>
|
|
</div>
|
|
</PageMobileNavigation>
|
|
|
|
{children}
|
|
</Page>
|
|
</SidebarProvider>
|
|
</TeamAccountWorkspaceContextProvider>
|
|
);
|
|
}
|
|
|
|
function HeaderLayout({
|
|
account,
|
|
children,
|
|
}: React.PropsWithChildren<{
|
|
account: string;
|
|
}>) {
|
|
const data = use(loadTeamWorkspace(account));
|
|
|
|
const accounts = data.accounts.map(({ name, slug, picture_url }) => ({
|
|
label: name,
|
|
value: slug,
|
|
image: picture_url,
|
|
}));
|
|
|
|
return (
|
|
<TeamAccountWorkspaceContextProvider value={data}>
|
|
<Page style={'header'}>
|
|
<PageNavigation>
|
|
<TeamAccountNavigationMenu workspace={data} />
|
|
</PageNavigation>
|
|
|
|
<PageMobileNavigation className={'flex items-center justify-between'}>
|
|
<AppLogo />
|
|
|
|
<div className={'group-data-[mobile:hidden]'}>
|
|
<TeamAccountLayoutMobileNavigation
|
|
userId={data.user.id}
|
|
accounts={accounts}
|
|
account={account}
|
|
/>
|
|
</div>
|
|
</PageMobileNavigation>
|
|
|
|
{children}
|
|
</Page>
|
|
</TeamAccountWorkspaceContextProvider>
|
|
);
|
|
}
|
|
|
|
async function getLayoutState(account: string) {
|
|
const cookieStore = await cookies();
|
|
const sidebarOpenCookie = cookieStore.get('sidebar:state');
|
|
const layoutCookie = cookieStore.get('layout-style');
|
|
const layoutStyle = layoutCookie?.value as PageLayoutStyle;
|
|
const config = getTeamAccountSidebarConfig(account);
|
|
|
|
const sidebarOpenCookieValue = sidebarOpenCookie
|
|
? sidebarOpenCookie.value === 'false'
|
|
: config.sidebarCollapsed;
|
|
|
|
return {
|
|
open: sidebarOpenCookieValue,
|
|
style: layoutStyle ?? config.style,
|
|
};
|
|
}
|
|
|
|
export default withI18n(TeamWorkspaceLayout);
|