feat: 添加可折叠侧边栏布局,优化仓库列表和工作空间页面

This commit is contained in:
xiongxiao
2026-03-19 20:26:27 +08:00
committed by cnb
parent 9a06364880
commit dd6eff9269
13 changed files with 568 additions and 236 deletions

View File

@@ -1,26 +1,12 @@
# cnb center
> cnb 仓库界面很不好用所以自己写了一个纯调api的界面方便管理仓库和查看同步状态
一个应用工作台
## 主要功能
## 功能
### git仓库管理功能
- 创建仓库
- 删除仓库使用cookie
- 同步仓库
仓库列出用户所有仓库,主体显示仓库名,描述。每一个仓库具备更快捷的功能模块。
启动是启动云开发环境。
![intro](./public/images/repo-info.png)
配置项
![config](./public/images/config-info.png)
示例cookie配置
```sh
CNBSESSION=1770622649.1935321989751226368.0bc7fc786f7052cb2b077c00ded651a5945d46d1e466f4fafa14ede554da14a0;csrfkey=158893308
```
1. 对话管理
2. 仓库管理
3. 云开发
4. 应用管理
5. Agent管理
6. 配置

View File

@@ -40,9 +40,11 @@
"lucide-react": "^0.577.0",
"nanoid": "^5.1.7",
"next-themes": "^0.4.6",
"re-resizable": "^6.11.2",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"react-hook-form": "^7.71.2",
"react-resizable": "^3.1.3",
"sonner": "^2.0.7",
"vite-plugin-pwa": "^1.2.0",
"zod": "^4.3.6",
@@ -63,6 +65,7 @@
"@types/node": "^25.5.0",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@types/react-resizable": "^3.0.8",
"@vitejs/plugin-react": "^6.0.1",
"dotenv": "^17.3.1",
"tailwind-merge": "^3.5.0",

View File

@@ -0,0 +1,270 @@
'use client'
import { useNavigate, useLocation } from '@tanstack/react-router'
import { useState } from 'react'
import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
DialogFooter,
} from '@/components/ui/dialog'
import { Button } from '@/components/ui/button'
import { cn } from '@/lib/utils'
import { ChevronLeft, ChevronRight, ChevronDown } from 'lucide-react'
import { Resizable } from 're-resizable'
export interface NavItem {
title: string
path: string
icon?: React.ReactNode
isDeveloping?: boolean
badge?: string
hidden?: boolean
children?: NavItem[]
}
export interface SidebarProps {
items: NavItem[]
className?: string
children?: React.ReactNode
logo?: React.ReactNode
title?: React.ReactNode
defaultCollapsed?: boolean
defaultWidth?: number
minWidth?: number
maxWidth?: number
}
export function Sidebar({
items,
className,
children,
logo,
title,
defaultCollapsed = false,
defaultWidth = 208,
minWidth = 120,
maxWidth = 400,
}: SidebarProps) {
const navigate = useNavigate()
const location = useLocation()
const currentPath = location.pathname
const [collapsed, setCollapsed] = useState(defaultCollapsed)
const [sidebarWidth, setSidebarWidth] = useState(defaultWidth)
const [expandedGroups, setExpandedGroups] = useState<Set<string>>(new Set())
const [developingDialog, setDevelopingDialog] = useState<{ open: boolean; title: string }>({
open: false,
title: '',
})
const toggleGroup = (path: string) => {
const newExpanded = new Set(expandedGroups)
if (newExpanded.has(path)) {
newExpanded.delete(path)
} else {
newExpanded.add(path)
}
setExpandedGroups(newExpanded)
}
const handleNavClick = (item: NavItem) => {
if (item.isDeveloping) {
setDevelopingDialog({ open: true, title: item.title })
} else {
navigate({ to: item.path })
}
}
// 判断当前路径是否激活(以导航路径开头)
const isActive = (path: string) => {
if (path === '/') {
return currentPath === '/'
}
return currentPath.startsWith(path);
}
// 渲染导航项
const renderNavItem = (item: NavItem, isChild = false) => {
if (item.hidden) return null
const hasChildren = item.children && item.children.length > 0
const isExpanded = expandedGroups.has(item.path)
const active = isActive(item.path)
return (
<li key={item.path} className='list-none'>
{hasChildren ? (
// 父菜单项(可展开)
<div>
<button
onClick={() => toggleGroup(item.path)}
className={cn(
'w-full flex items-center gap-3 px-3 py-2 text-sm rounded-lg transition-colors cursor-pointer',
active
? 'bg-gray-200 text-gray-900 font-medium'
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900',
collapsed && 'justify-center px-2'
)}
title={collapsed ? item.title : undefined}
>
{item.icon && <span className="flex-shrink-0">{item.icon}</span>}
{!collapsed && (
<>
<span className="flex-1 text-left">{item.title}</span>
<ChevronDown className={cn('w-4 h-4 transition-transform', isExpanded && 'rotate-180')} />
</>
)}
</button>
{/* 子菜单 */}
{!collapsed && isExpanded && item.children && (
<ul className="ml-6 mt-1 space-y-1 list-none">
{item.children.map(child => renderNavItem(child, true))}
</ul>
)}
</div>
) : (
// 普通菜单项
<button
onClick={() => handleNavClick(item)}
className={cn(
'w-full flex items-center gap-3 px-3 py-2 text-sm rounded-lg transition-colors cursor-pointer',
active
? 'bg-gray-200 text-gray-900 font-medium'
: 'text-gray-600 hover:bg-gray-100 hover:text-gray-900',
item.isDeveloping && 'opacity-60',
isChild && 'py-1.5',
collapsed && 'justify-center px-2'
)}
title={collapsed ? item.title : undefined}
>
{item.icon && <span className="flex-shrink-0">{item.icon}</span>}
{!collapsed && (
<>
<span className="flex-1 text-left">{item.title}</span>
{item.isDeveloping && (
<span className="text-xs bg-gray-200 text-gray-600 px-1.5 py-0.5 rounded">
dev
</span>
)}
{item.badge && !item.isDeveloping && (
<span className="text-xs bg-gray-200 text-gray-700 px-1.5 py-0.5 rounded">
{item.badge}
</span>
)}
</>
)}
</button>
)}
</li>
)
}
return (
<>
<div className={cn('flex h-full', className)}>
{/* 侧边栏 */}
{!collapsed ? (
<Resizable
defaultSize={{ width: sidebarWidth, height: '100%' }}
minWidth={minWidth}
maxWidth={maxWidth}
onResizeStop={(_e, _direction, ref, _d) => {
setSidebarWidth(ref.offsetWidth)
}}
enable={{
right: true,
}}
handleComponent={{
right: <div className="w-1 h-full cursor-col-resize hover:bg-blue-400 transition-colors" />,
}}
>
<aside
className={cn(
'border-r bg-white flex-shrink-0 flex flex-col'
)}
style={{ width: sidebarWidth }}
>
{/* Logo 区域 */}
<div className={cn(
'h-12 flex items-center border-b px-3'
)}>
{logo && (
<div className="flex-shrink-0 flex items-center gap-2">{logo}</div>
)}
{title && (
<span className="text-sm font-medium text-gray-900 truncate ml-1">{title}</span>
)}
<button
onClick={() => setCollapsed(true)}
className="ml-auto flex-shrink-0 p-1 rounded-lg hover:bg-gray-100 transition-colors cursor-pointer"
title="收起"
>
<ChevronLeft className="w-4 h-4 text-gray-500" />
</button>
</div>
{/* 导航区域 */}
<nav className="flex-1 p-2 overflow-y-auto">
<ul className="space-y-1 list-none">
{items.map((item) => renderNavItem(item))}
</ul>
</nav>
</aside>
</Resizable>
) : (
// 收起状态
<aside className="w-14 border-r bg-white flex-shrink-0 flex flex-col">
{/* Logo 区域 */}
<div className="h-12 flex items-center justify-center border-b px-2">
<div className="group relative flex-shrink-0">
<button
onClick={() => setCollapsed(false)}
className="p-1 rounded-lg hover:bg-gray-100 transition-colors cursor-pointer"
title="展开"
>
<span className="group-hover:hidden">{logo}</span>
<ChevronRight className="w-5 h-5 hidden group-hover:block text-gray-600" />
</button>
</div>
</div>
{/* 导航区域 */}
<nav className="flex-1 p-2 overflow-y-auto">
<ul className="space-y-1 list-none">
{items.map((item) => renderNavItem(item))}
</ul>
</nav>
</aside>
)}
{/* 主内容区域 */}
<main className="flex-1 overflow-auto h-full bg-gray-50">
{children}
</main>
</div>
{/* 开发中弹窗 */}
<Dialog
open={developingDialog.open}
onOpenChange={(open) => setDevelopingDialog({ open, title: '' })}
>
<DialogContent>
<DialogHeader>
<DialogTitle>{developingDialog.title} - </DialogTitle>
<DialogDescription>
访
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button onClick={() => setDevelopingDialog({ open: false, title: '' })}>
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</>
)
}

View File

@@ -4,7 +4,7 @@ import { Label } from '@/components/ui/label';
import { Button } from '@/components/ui/button';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
import { Info } from 'lucide-react';
import { SidebarLayout } from '../sidebar/components';
export const ConfigPage = () => {
const { config, setConfig, saveToRemote, loadFromRemote } = useConfigStore();
const handleSubmit = (e: React.FormEvent) => {
@@ -17,13 +17,13 @@ export const ConfigPage = () => {
};
return (
<TooltipProvider>
<SidebarLayout>
<div className="container mx-auto max-w-2xl py-4 md:py-8 px-4">
<div className="bg-white md:rounded-lg md:border md:shadow-sm">
<div className="p-4 md:p-6 border-b">
<h1 className="text-xl md:text-2xl font-bold">CNB </h1>
<p className="text-sm text-muted-foreground mt-1">
CNB API
CNB API
</p>
</div>
<div className="p-4 md:p-6">
@@ -68,7 +68,7 @@ export const ConfigPage = () => {
</TooltipTrigger>
<TooltipContent>
<p>
Cookie
Cookie 7
<a
href="https://cnb.cool/kevisual/cnb-live-extension"
target="_blank"
@@ -102,7 +102,7 @@ export const ConfigPage = () => {
</div>
</div>
</div>
</TooltipProvider>
</SidebarLayout>
);
};

View File

@@ -1 +0,0 @@
// gitea.tsx

View File

@@ -47,8 +47,6 @@ export function RepoCard({ showReturn = false, repo }: RepoCardProps) {
return store.workspaceList.find(ws => ws.slug === repo.path)
}, [store.workspaceList, repo.path])
const isWorkspaceActive = !!workspace
const owner = repo.path.split('/')[0]
const isMine = myOrgs.includes(owner)
const navigate = useNavigate();
const isKnowledge = repo?.flags === "KnowledgeBase"
const createKnow = async () => {
@@ -346,18 +344,6 @@ export function RepoCard({ showReturn = false, repo }: RepoCardProps) {
<Play className="w-3.5 h-3.5" />
<span className="font-medium"></span>
</span>}
{isMine && (
<span
className="flex items-center gap-1 hover:text-neutral-900 transition-colors cursor-pointer whitespace-nowrap"
onClick={() => {
store.setSelectedSyncRepo(repo)
store.setSyncDialogOpen(true)
}}
>
<RefreshCw className="w-3.5 h-3.5" />
<span className="font-medium"></span>
</span>
)}
</div>
</div>
</Card>

View File

@@ -12,6 +12,8 @@ import Fuse from 'fuse.js'
import { useNavigate } from '@tanstack/react-router'
import { useLayoutStore } from '../auth/store'
import { useConfigStore } from '../config/store'
import { SidebarLayout } from '../sidebar/components'
import { Checkbox } from '@/components/ui/checkbox'
export const App = () => {
const { list, refresh, loading, workspaceList, setShowCreateDialog } = useRepoStore(useShallow((state) => ({
@@ -22,6 +24,7 @@ export const App = () => {
setShowCreateDialog: state.setShowCreateDialog,
})))
const [searchQuery, setSearchQuery] = useState('')
const [filterDev, setFilterDev] = useState(false)
const navigate = useNavigate();
const me = useLayoutStore(state => state.me)
const configStore = useConfigStore(useShallow(state => ({ checkConfig: state.checkConfig })))
@@ -45,11 +48,19 @@ export const App = () => {
return 0
})
if (!searchQuery.trim()) {
return sortedList
let filteredList = sortedList
if (filterDev) {
filteredList = sortedList.filter(repo => {
const topics = repo.topics ? repo.topics.split(',').map(t => t.trim().toLowerCase()) : []
return topics.some(topic => topic.includes('dev'))
})
}
const fuse = new Fuse(sortedList, {
if (!searchQuery.trim()) {
return filteredList
}
const fuse = new Fuse(filteredList, {
keys: ['name', 'path', 'description'],
threshold: 0.3,
includeScore: true
@@ -57,10 +68,11 @@ export const App = () => {
const results = fuse.search(searchQuery)
return results.map(result => result.item)
}, [list, workspaceList, searchQuery])
}, [list, workspaceList, searchQuery, filterDev])
const isCNB = location.hostname.includes('cnb.run')
return (
<SidebarLayout>
<div className="min-h-screen bg-neutral-50 flex flex-col">
<div className="container mx-auto p-4 md:p-6 max-w-7xl flex-1">
<div className="mb-6 md:mb-8 flex flex-col gap-4">
@@ -73,7 +85,9 @@ export const App = () => {
<Settings className="inline-block h-5 w-5 text-neutral-400 hover:text-neutral-600 cursor-pointer" onClick={() => navigate({ to: '/config' })} />
</h1>
</div>
<p className="text-neutral-600 text-sm md:text-base"> {list.length} </p>
<p className="text-neutral-600 text-sm md:text-base">
{filterDev ? `显示 ${appList.length} 个 dev 仓库` : `${list.length} 个仓库`}
</p>
</div>
<div className="flex flex-wrap items-center gap-2 md:ml-auto">
<Button
@@ -107,7 +121,8 @@ export const App = () => {
</div>
<div className="mb-4 md:mb-6">
<div className="relative">
<div className="flex flex-col sm:flex-row gap-3">
<div className="relative flex-1">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-neutral-400" />
<Input
type="text"
@@ -117,6 +132,20 @@ export const App = () => {
className="pl-10"
/>
</div>
<div className="flex items-center gap-2">
<Checkbox
id="filter-dev"
checked={filterDev}
onCheckedChange={(checked) => setFilterDev(checked === true)}
/>
<label
htmlFor="filter-dev"
className="text-sm text-neutral-600 cursor-pointer select-none"
>
dev
</label>
</div>
</div>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 md:gap-6">
@@ -152,6 +181,7 @@ export const App = () => {
<CommonRepoDialog />
</div>
</SidebarLayout>
)
}

View File

@@ -5,6 +5,7 @@ import { useShallow } from "zustand/shallow";
import BuildConfig from "../components/BuildConfig";
import { CommonRepoDialog } from "../page";
import { RepoCard } from "../components/RepoCard";
import { SidebarLayout } from "@/pages/sidebar/components";
export const App = () => {
const params = useSearch({ strict: false }) as { repo?: string, tab?: string };
@@ -13,6 +14,7 @@ export const App = () => {
editRepo: state.editRepo,
refresh: state.refresh,
loading: state.loading,
buildConfig: state.buildConfig,
})));
const [activeTab, setActiveTab] = useState(params.tab || "build");
const tabs = [
@@ -21,7 +23,11 @@ export const App = () => {
]
useEffect(() => {
if (params.repo) {
if(repoStore.buildConfig?.repo !== params.repo) {
repoStore.getItem(params.repo);
}
console.log('refreshing repo',repoStore.buildConfig, params.repo)
// repoStore.getItem(params.repo);
repoStore.refresh({ search: params.repo, showTips: false });
} else {
console.log('no repo param')
@@ -31,9 +37,10 @@ export const App = () => {
return <div>Loading...</div>
}
return (
<SidebarLayout>
<div className="p-2 md:p-4 flex-col flex gap-2 md:gap-4 h-full">
<div className="px-2 md:px-4 h-full scrollbar flex-col flex gap-3 md:gap-4 overflow-hidden">
<div className="flex border-b overflow-x-auto">
<div className="flex border-b overflow-x-auto h-12 shrink-0">
{tabs.map(tab => (
<div
key={tab.key}
@@ -59,6 +66,7 @@ export const App = () => {
</div>
<CommonRepoDialog />
</div>
</SidebarLayout>
)
}

View File

@@ -0,0 +1,11 @@
export const Logo = (props: React.SVGProps<SVGSVGElement>) => {
return (
<svg {...props} width="320" height="320" viewBox="0 0 320 320" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M228.906 40.2412C229.882 37.5108 228.906 34.3903 226.759 32.44C219.342 26.004 200.799 12.3519 173.082 10.4016C141.852 8.06121 122.528 16.4475 112.769 22.6885C108.474 25.4189 108.279 31.4649 112.183 34.3903L191.625 96.2149C198.652 101.676 208.997 98.5553 211.729 90.169L228.711 40.2412H228.906Z" fill="black" />
<path d="M32.9381 223.564C29.6199 225.71 28.2536 229.805 29.2295 233.511C32.1573 244.432 41.3312 266.861 66.9009 287.534C92.4706 308.012 122.725 310.353 135.607 309.963C139.511 309.963 142.829 307.427 144 303.722L194.945 142.627C198.653 130.925 185.576 121.173 175.426 127.999L32.9381 223.564Z" fill="black" />
<path d="M70.2169 53.4955C67.6794 52.5203 64.9468 52.7153 62.6045 53.8855C53.2355 58.9563 29.032 74.7538 16.54 107.324C6.78054 132.288 10.0987 159.982 12.8314 173.439C13.6121 177.925 18.2967 180.46 22.5908 178.705L175.424 119.026C186.354 114.735 186.354 99.3276 175.424 95.0369L70.2169 53.4955Z" fill="black" />
<path d="M297.03 168.968C301.519 171.893 307.57 169.358 308.351 164.092C310.303 150.05 312.06 125.866 304.057 107.338C293.321 82.9591 274.974 67.7468 266.19 61.7008C263.458 59.7505 259.749 59.9456 257.212 62.2859L218.564 96.4162C212.318 102.072 212.904 112.019 219.931 116.699L297.03 168.968Z" fill="black" />
<path d="M189.089 299.428C188.699 303.914 192.603 307.814 197.092 307.229C211.731 305.669 241.79 299.818 264.237 278.365C286.098 257.496 293.32 232.728 295.272 222.781C295.858 220.051 295.272 217.32 293.515 215.175L225.98 131.897C218.758 122.925 204.119 127.411 203.143 138.918L189.089 299.233V299.428Z" fill="black" />
</svg>
)
}

View File

@@ -0,0 +1,35 @@
import { FolderKanban, LayoutDashboard, Settings, PlayCircle } from 'lucide-react'
import { Sidebar, type NavItem } from '@/components/a/Sidebar'
import { Logo } from './CNBBlackLogo.tsx'
const navItems: NavItem[] = [
{
title: '仓库管理',
path: '/',
icon: <FolderKanban className="w-5 h-5" />,
},
{
title: '工作空间',
path: '/workspaces',
icon: <LayoutDashboard className="w-5 h-5" />,
},
{
title: '应用配置',
path: '/config',
icon: <Settings className="w-5 h-5" />,
},
{
title: '其他',
path: '/demo',
icon: <PlayCircle className="w-5 h-5" />,
isDeveloping: true,
},
]
export function SidebarLayout({ children }: { children: React.ReactNode }) {
return (
<Sidebar items={navItems} title='云原生' logo={<Logo className='w-6 h-6' />}>
{children}
</Sidebar>
)
}

View File

@@ -0,0 +1 @@
export { SidebarLayout } from './Sidebar'

View File

View File

@@ -14,6 +14,7 @@ import {
} from "@/components/ui/card";
import { CreateDialog, EditDialog } from "./components";
import { SearchIcon, RefreshCwIcon, PlusIcon, PencilIcon, TrashIcon } from "lucide-react";
import { SidebarLayout } from "@/pages/sidebar/components";
export const App = () => {
const workspaceStore = useWorkspaceStore(useShallow((state: WorkspaceState) => {
@@ -58,6 +59,7 @@ export const App = () => {
};
return (
<SidebarLayout>
<div className="p-5">
<div className="flex justify-between items-center mb-5">
<h1 className="text-2xl font-semibold">Workspaces</h1>
@@ -144,6 +146,7 @@ export const App = () => {
onSubmit={workspaceStore.updateItem}
/>
</div>
</SidebarLayout>
);
};