Skip to content

Commit

Permalink
feat(v2): add mobile layout
Browse files Browse the repository at this point in the history
  • Loading branch information
moonrailgun committed Apr 7, 2024
1 parent 0711c3c commit af1d99d
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 60 deletions.
5 changes: 4 additions & 1 deletion src/client/App.tsx
Expand Up @@ -23,6 +23,7 @@ import { isDev } from './utils/env';
import { RouterProvider, createRouter } from '@tanstack/react-router';
import { routeTree } from './routeTree.gen';
import { DefaultNotFound } from './components/DefaultNotFound';
import { TooltipProvider } from './components/ui/tooltip';

const router = createRouter({
routeTree,
Expand Down Expand Up @@ -95,7 +96,9 @@ export const App: React.FC = React.memo(() => {
{isDev ? (
// Compatible with old routes
<BrowserRouter>
<RouterProvider router={router} context={{ userInfo }} />
<TooltipProvider delayDuration={0}>
<RouterProvider router={router} context={{ userInfo }} />
</TooltipProvider>
</BrowserRouter>
) : (
<BrowserRouter>
Expand Down
109 changes: 54 additions & 55 deletions src/client/pages/Layout/DesktopLayout.tsx
Expand Up @@ -22,6 +22,7 @@ import { Outlet } from '@tanstack/react-router';
import { trpc } from '@/api/trpc';
import { useUserStore } from '@/store/user';
import { LayoutProps } from './types';
import { useTranslation } from '@i18next-toolkit/react';

const defaultLayout: [number, number, number] = [265, 440, 655];

Expand All @@ -45,6 +46,7 @@ export const DesktopLayout: React.FC<LayoutProps> = React.memo((props) => {
enabled: !!workspaceId,
}
);
const { t } = useTranslation();

const navbar = (
<>
Expand All @@ -61,31 +63,31 @@ export const DesktopLayout: React.FC<LayoutProps> = React.memo((props) => {
isCollapsed={isCollapsed}
links={[
{
title: 'Website',
title: t('Website'),
label: String(serviceCount?.website ?? ''),
icon: LuAreaChart,
to: '/website',
},
{
title: 'Monitor',
title: t('Monitor'),
label: String(serviceCount?.monitor ?? ''),
icon: LuMonitorDot,
to: '/monitor',
},
{
title: 'Servers',
title: t('Servers'),
label: '',
icon: LuServer,
to: '/server',
},
{
title: 'Telemetry',
title: t('Telemetry'),
label: String(serviceCount?.telemetry ?? ''),
icon: LuWifi,
to: '/telemetry',
},
{
title: 'Pages',
title: t('Pages'),
label: String(serviceCount?.page ?? ''),
icon: LuFilePieChart,
to: '/page',
Expand All @@ -103,60 +105,57 @@ export const DesktopLayout: React.FC<LayoutProps> = React.memo((props) => {
);

return (
<TooltipProvider delayDuration={0}>
<ResizablePanelGroup
direction="horizontal"
onLayout={(sizes: number[]) => {
if (sizes.length === 3) {
setLayout(sizes as typeof defaultLayout);
} else if (sizes.length === 2) {
const listSize = layout[1];
const rest = 100 - sizes[0] - listSize;
setLayout([sizes[0], listSize, rest]);
}
<ResizablePanelGroup
direction="horizontal"
onLayout={(sizes: number[]) => {
if (sizes.length === 3) {
setLayout(sizes as typeof defaultLayout);
} else if (sizes.length === 2) {
const listSize = layout[1];
const rest = 100 - sizes[0] - listSize;
setLayout([sizes[0], listSize, rest]);
}
}}
className="h-full items-stretch"
>
<ResizablePanel
defaultSize={layout[0]}
collapsedSize={1}
collapsible={true}
minSize={10}
maxSize={20}
onCollapse={() => {
setIsCollapsed(true);
}}
className="h-full items-stretch"
onExpand={() => {
setIsCollapsed(false);
}}
className={cn(
'flex flex-col',
isCollapsed && 'min-w-[50px] transition-all duration-300 ease-in-out'
)}
>
<ResizablePanel
defaultSize={layout[0]}
collapsedSize={1}
collapsible={true}
minSize={10}
maxSize={20}
onCollapse={() => {
setIsCollapsed(true);
}}
onExpand={() => {
setIsCollapsed(false);
}}
className={cn(
'flex flex-col',
isCollapsed &&
'min-w-[50px] transition-all duration-300 ease-in-out'
)}
>
{navbar}
</ResizablePanel>
{navbar}
</ResizablePanel>

{props.list && (
<>
<ResizableHandle withHandle />
<ResizablePanel defaultSize={layout[1]} minSize={25}>
<div className="h-full overflow-hidden">{props.list}</div>
</ResizablePanel>
</>
)}
{props.list && (
<>
<ResizableHandle withHandle />
<ResizablePanel defaultSize={layout[1]} minSize={25}>
<div className="h-full overflow-hidden">{props.list}</div>
</ResizablePanel>
</>
)}

<ResizableHandle withHandle />
<ResizablePanel
defaultSize={props.list ? layout[2] : layout[1] + layout[2]}
>
<div className="h-full overflow-hidden">
{props.children ?? <Outlet />}
</div>
</ResizablePanel>
</ResizablePanelGroup>
</TooltipProvider>
<ResizableHandle withHandle />
<ResizablePanel
defaultSize={props.list ? layout[2] : layout[1] + layout[2]}
>
<div className="h-full overflow-hidden">
{props.children ?? <Outlet />}
</div>
</ResizablePanel>
</ResizablePanelGroup>
);
});
DesktopLayout.displayName = 'DesktopLayout';
103 changes: 101 additions & 2 deletions src/client/pages/Layout/MobileLayout.tsx
@@ -1,6 +1,105 @@
import React from 'react';
import {
LuAreaChart,
LuFilePieChart,
LuMenu,
LuMonitorDot,
LuServer,
LuWifi,
} from 'react-icons/lu';
import { useTranslation } from '@i18next-toolkit/react';
import { IconType } from 'react-icons';
import { useRouterState, Link, Outlet } from '@tanstack/react-router';
import { cn } from '@/utils/style';
import { Separator } from '@/components/ui/separator';
import { LayoutProps } from './types';
import { UserConfig } from './UserConfig';
import { ScrollArea } from '@/components/ui/scroll-area';
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
import { Button } from '@/components/ui/button';

export const MobileLayout: React.FC = React.memo(() => {
return <div>Mobile</div>;
export const MobileLayout: React.FC<LayoutProps> = React.memo((props) => {
const { t } = useTranslation();

return (
<div className="flex h-svh flex-col">
<div className="flex h-[52px] items-center justify-between px-2">
<Sheet>
<SheetTrigger>
<Button variant="outline" size="icon">
<LuMenu />
</Button>
</SheetTrigger>
<SheetContent side="left" className="w-11/12">
<ScrollArea className="h-full">{props.list}</ScrollArea>
</SheetContent>
</Sheet>

<div>
<img className="m-auto h-8 w-8" src="/icon.svg" />
</div>

<div>
<UserConfig isCollapsed={true} />
</div>
</div>

<Separator />

<div className="flex-1 overflow-hidden">
{props.children ?? <Outlet />}
</div>

<Separator />

<div className="p-2">
<div className="flex justify-between">
<MobileNavItem
title={t('Website')}
icon={LuAreaChart}
to="/website"
/>
<MobileNavItem
title={t('Monitor')}
icon={LuMonitorDot}
to="/monitor"
/>
<MobileNavItem title={t('Servers')} icon={LuServer} to="/server" />
<MobileNavItem title={t('Telemetry')} icon={LuWifi} to="/telemetry" />
<MobileNavItem title={t('Pages')} icon={LuFilePieChart} to="/page" />
</div>
</div>
</div>
);
});
MobileLayout.displayName = 'MobileLayout';

const MobileNavItem: React.FC<{
title: string;
icon: IconType;
to: string;
}> = React.memo((props) => {
const pathname = useRouterState({
select: (state) => state.location.pathname,
});

const isSelect = pathname.startsWith(props.to);

return (
<Link
className={cn(
'flex-1 rounded-lg p-1 text-center',
isSelect
? 'bg-muted text-black dark:text-white'
: 'text-muted-foreground'
)}
to={props.to}
>
<props.icon size={24} className="m-auto mb-1" />
<div className={cn('text-sm font-semibold', isSelect && 'font-bold')}>
{props.title}
</div>
</Link>
);
});
MobileNavItem.displayName = 'MobileNavItem';
35 changes: 34 additions & 1 deletion src/client/pages/Layout/UserConfig.tsx
Expand Up @@ -16,7 +16,7 @@ import {
} from '@/components/ui/dropdown-menu';
import { useEvent } from '@/hooks/useEvent';
import { useSettingsStore } from '@/store/settings';
import { useUserInfo } from '@/store/user';
import { useCurrentWorkspaceId, useUserInfo, useUserStore } from '@/store/user';
import { languages } from '@/utils/constants';
import { useTranslation, setLanguage } from '@i18next-toolkit/react';
import { useNavigate } from '@tanstack/react-router';
Expand All @@ -32,6 +32,20 @@ export const UserConfig: React.FC<UserConfigProps> = React.memo((props) => {
const { i18n, t } = useTranslation();
const navigate = useNavigate();
const colorScheme = useSettingsStore((state) => state.colorScheme);
const workspaceId = useCurrentWorkspaceId();
const workspaces = useUserStore((state) => {
const userInfo = state.info;
if (userInfo) {
return userInfo.workspaces.map((w) => ({
id: w.workspace.id,
name: w.workspace.name,
role: w.role,
current: userInfo.currentWorkspace?.id === w.workspace.id,
}));
}

return [];
});

const handleChangeColorSchema = useEvent((colorScheme) => {
useSettingsStore.setState({
Expand Down Expand Up @@ -97,6 +111,25 @@ export const UserConfig: React.FC<UserConfigProps> = React.memo((props) => {
{t('Notifications')}
</DropdownMenuItem>

<DropdownMenuSub>
<DropdownMenuSubTrigger>{t('Workspaces')}</DropdownMenuSubTrigger>
<DropdownMenuPortal>
<DropdownMenuSubContent>
<DropdownMenuRadioGroup value={workspaceId}>
{workspaces.map((workspace) => (
<DropdownMenuRadioItem
key={workspace.id}
value={workspace.id}
disabled={true}
>
{workspace.name}
</DropdownMenuRadioItem>
))}
</DropdownMenuRadioGroup>
</DropdownMenuSubContent>
</DropdownMenuPortal>
</DropdownMenuSub>

<DropdownMenuSub>
<DropdownMenuSubTrigger>{t('Language')}</DropdownMenuSubTrigger>
<DropdownMenuPortal>
Expand Down
2 changes: 1 addition & 1 deletion src/client/pages/LayoutV2.tsx
Expand Up @@ -8,7 +8,7 @@ export const LayoutV2: React.FC<LayoutProps> = React.memo((props) => {
const isMobile = useIsMobile();

if (isMobile) {
return <MobileLayout />;
return <MobileLayout {...props} />;
}

return <DesktopLayout {...props} />;
Expand Down

0 comments on commit af1d99d

Please sign in to comment.