v0.2.3

.github/workflows/release.yml

@@ -424,7 +424,7 @@ jobs:
           <a href="https://github.com/coolcoala/clash-verge-rev-lite/releases/download/v${{ env.VERSION }}/Clash.Verge.Rev.Lite_${{ env.VERSION }}_x64.dmg"><img src="https://img.shields.io/badge/DMG-default?style=flat&logo=apple&label=Intel"></a><br>
           > :warning: **Warning**
           If you get a notification that the application is corrupted when you run it on macOS, run this command:<br>
-          `sudo xattr -r -c /Applications/Clash\ Verge\ Rev\ Lite.app`
+          <code>sudo xattr -r -c /Applications/Clash\ Verge\ Rev\ Lite.app</code>
           
           ### Linux
           <a href="https://github.com/coolcoala/clash-verge-rev-lite/releases/download/v${{ env.VERSION }}/Clash.Verge.Rev.Lite_${{ env.VERSION }}_amd64.deb"><img src="https://img.shields.io/badge/x64-default?style=flat&logo=debian&label=DEB"> </a><br>

UPDATELOG.md

@@ -1,3 +1,12 @@
+## v0.2.3
+
+- fixed problem with profile inactivation after adding via deeplink on windows
+- corrected layout on the proxy page, now all cards are the same size
+- corrected announe transposition by \n
+- corrected side menu in compressed window
+- added check at the main toggle switch, now it cannot be enabled if there are no profiles.
+
+
 ## v0.2.1
 
 - added headers "announce-url", "update-always"

hooks/use-mobile.ts

@@ -0,0 +1,19 @@
+import * as React from "react"
+
+const MOBILE_BREAKPOINT = 768
+
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(undefined)
+
+  React.useEffect(() => {
+    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
+    const onChange = () => {
+      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
+    }
+    mql.addEventListener("change", onChange)
+    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
+    return () => mql.removeEventListener("change", onChange)
+  }, [])
+
+  return !!isMobile
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "license": "GPL-3.0-only",
   "scripts": {
     "dev": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev",

src-tauri/Cargo.lock

@@ -1061,7 +1061,7 @@ dependencies = [
 
 [[package]]
 name = "clash-verge"
-version = "0.2.1"
+version = "0.2.3"
 dependencies = [
  "ab_glyph",
  "aes-gcm",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clash-verge"
-version = "0.2.1"
+version = "0.2.3"
 description = "clash verge"
 authors = ["zzzgydi", "wonfen", "MystiPanda", "coolcoala"]
 license = "GPL-3.0-only"

src-tauri/src/utils/resolve.rs

@@ -565,7 +565,7 @@ pub async fn resolve_scheme(param: String) -> Result<()> {
             Some(url) => {
                 log::info!(target:"app", "decoded subscription url: {url}");
 
-                create_window(false);
+                create_window(true);
                 match PrfItem::from_url(url.as_ref(), name, None, None).await {
                     Ok(item) => {
                         let uid = item.uid.clone().unwrap();

src-tauri/tauri.conf.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.1",
+  "version": "0.2.3",
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "bundle": {
     "active": true,

src/components/layout/sidebar.tsx

@@ -0,0 +1,97 @@
+import { Link } from 'react-router-dom';
+import {
+  Sidebar,
+  SidebarContent, SidebarFooter,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarHeader,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem, useSidebar,
+} from "@/components/ui/sidebar"
+import { t } from 'i18next';
+import { cn } from '@root/lib/utils';
+
+import {
+  Home,
+  Users,
+  Server,
+  Cable,
+  ListChecks,
+  FileText,
+  Settings, EarthLock,
+} from 'lucide-react';
+import { UpdateButton } from "@/components/layout/update-button";
+import React from "react";
+import { SheetClose } from '@/components/ui/sheet';
+
+const menuItems = [
+  { title: 'Home', url: '/home', icon: Home },
+  { title: 'Profiles', url: '/profile', icon: Users },
+  { title: 'Proxies', url: '/proxies', icon: Server },
+  { title: 'Connections', url: '/connections', icon: Cable },
+  { title: 'Rules', url: '/rules', icon: ListChecks },
+  { title: 'Logs', url: '/logs', icon: FileText },
+  { title: 'Settings', url: '/settings', icon: Settings },
+];
+
+export function AppSidebar() {
+  const { isMobile } = useSidebar();
+  return (
+    <Sidebar variant="floating" collapsible="icon">
+      <SidebarHeader>
+        <SidebarMenuButton>
+          <EarthLock/>
+          <span className="font-semibold group-data-[state=collapsed]:hidden">
+            Clash Koala
+          </span>
+        </SidebarMenuButton>
+      </SidebarHeader>
+      <SidebarContent>
+        <SidebarGroup>
+          <SidebarGroupContent>
+            <SidebarMenu className="gap-3">
+              {menuItems.map((item) => {
+                const isActive = location.pathname === item.url;
+                const linkElement = (
+                  <Link
+                    key={item.title}
+                    to={item.url}
+                    className={cn(
+                      'flex items-center gap-3 rounded-lg px-3 py-2 text-muted-foreground transition-all hover:text-primary',
+                      'data-[active=true]:font-semibold data-[active=true]:border'
+                    )}
+                  >
+                    <item.icon className="h-4 w-4 drop-shadow-md" />
+                    {t(item.title)}
+                  </Link>
+                )
+                return (
+                <SidebarMenuItem key={item.title} className="my-1">
+                  <SidebarMenuButton
+                    asChild
+                    isActive={isActive}
+                    tooltip={t(item.title)}>
+                    {isMobile ? (
+                        <SheetClose asChild>
+                          {linkElement}
+                        </SheetClose>
+                      ) : (
+                        linkElement
+                      )}
+                  </SidebarMenuButton>
+                </SidebarMenuItem>
+                )
+              })}
+            </SidebarMenu>
+          </SidebarGroupContent>
+        </SidebarGroup>
+      </SidebarContent>
+      <SidebarFooter>
+        <div className="w-full flex justify-center">
+          <UpdateButton className="bg-green-700 hover:bg-green-500 hover:text-white text-white text-shadow-md" />
+        </div>
+      </SidebarFooter>
+    </Sidebar>
+  )
+}

src/components/layout/update-button.tsx

@@ -5,6 +5,9 @@ import { UpdateViewer } from "../setting/mods/update-viewer";
 import { DialogRef } from "../base";
 import { useVerge } from "@/hooks/use-verge";
 import { Button } from "@/components/ui/button";
+import { t } from "i18next";
+import {Download, RefreshCw} from "lucide-react";
+import { useSidebar } from "../ui/sidebar";
 
 interface Props {
   className?: string;
@@ -14,6 +17,7 @@ export const UpdateButton = (props: Props) => {
   const { className } = props;
   const { verge } = useVerge();
   const { auto_check_update } = verge || {};
+   const { state: sidebarState } = useSidebar();
 
   const viewerRef = useRef<DialogRef>(null);
 
@@ -32,15 +36,26 @@ export const UpdateButton = (props: Props) => {
   return (
     <>
       <UpdateViewer ref={viewerRef} />
-
+      {sidebarState === 'collapsed' ? (
-      <Button
+        <Button
-        variant="destructive"
+          variant="outline"
-        size="sm"
+          size="icon"
-        className={className}
+          className={className}
-        onClick={() => viewerRef.current?.open()}
+          onClick={() => viewerRef.current?.open()}
-      >
+        >
-        New
+          <Download />
-      </Button>
+        </Button>
+      ) : (
+        <Button
+          variant="outline"
+          size="lg"
+          className={className}
+          onClick={() => viewerRef.current?.open()}
+        >
+          <Download />
+          {t("New update")}
+        </Button>
+      )}
     </>
   );
 };

src/components/proxy/proxy-item-mini.tsx

@@ -66,7 +66,7 @@ export const ProxyItemMini = (props: Props) => {
       title={`${proxy.name}\n${proxy.now ?? ""}`}
       className="group relative flex h-16 cursor-pointer items-center justify-between rounded-lg border bg-card p-3 shadow-sm transition-colors duration-200 hover:bg-accent data-[selected=true]:ring-2 data-[selected=true]:ring-primary"
     >
-      <div className="flex-1 min-w-0">
+      <div className="flex-1 min-w-0 w-0">
         <p className="truncate text-sm font-medium">{proxy.name}</p>
 
         {showType && (

src/components/setting/mods/update-viewer.tsx

@@ -118,7 +118,7 @@ export const UpdateViewer = forwardRef<DialogRef>((props, ref) => {
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogContent className="sm:max-w-2xl">
         <DialogHeader>
-          <div className="flex justify-between items-center">
+          <div className="flex justify-between items-center pr-5">
             <DialogTitle>
               {t("New Version")} v{updateInfo?.version}
             </DialogTitle>

src/components/ui/sidebar.tsx

@@ -0,0 +1,724 @@
+import * as React from "react"
+import { Slot } from "@radix-ui/react-slot"
+import { cva, VariantProps } from "class-variance-authority"
+import { PanelLeftIcon } from "lucide-react"
+
+import { useIsMobile } from "@root/hooks/use-mobile"
+import { cn } from "@root/lib/utils"
+import { Button } from "@root/src/components/ui/button"
+import { Input } from "@root/src/components/ui/input"
+import { Separator } from "@root/src/components/ui/separator"
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@root/src/components/ui/sheet"
+import { Skeleton } from "@root/src/components/ui/skeleton"
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@root/src/components/ui/tooltip"
+
+const SIDEBAR_COOKIE_NAME = "sidebar_state"
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7
+const SIDEBAR_WIDTH = "16rem"
+const SIDEBAR_WIDTH_MOBILE = "18rem"
+const SIDEBAR_WIDTH_ICON = "3rem"
+const SIDEBAR_KEYBOARD_SHORTCUT = "b"
+
+type SidebarContextProps = {
+  state: "expanded" | "collapsed"
+  open: boolean
+  setOpen: (open: boolean) => void
+  openMobile: boolean
+  setOpenMobile: (open: boolean) => void
+  isMobile: boolean
+  toggleSidebar: () => void
+}
+
+const SidebarContext = React.createContext<SidebarContextProps | null>(null)
+
+function useSidebar() {
+  const context = React.useContext(SidebarContext)
+  if (!context) {
+    throw new Error("useSidebar must be used within a SidebarProvider.")
+  }
+
+  return context
+}
+
+function SidebarProvider({
+  defaultOpen = true,
+  open: openProp,
+  onOpenChange: setOpenProp,
+  className,
+  style,
+  children,
+  ...props
+}: React.ComponentProps<"div"> & {
+  defaultOpen?: boolean
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}) {
+  const isMobile = useIsMobile()
+  const [openMobile, setOpenMobile] = React.useState(false)
+
+  // This is the internal state of the sidebar.
+  // We use openProp and setOpenProp for control from outside the component.
+  const [_open, _setOpen] = React.useState(defaultOpen)
+  const open = openProp ?? _open
+  const setOpen = React.useCallback(
+    (value: boolean | ((value: boolean) => boolean)) => {
+      const openState = typeof value === "function" ? value(open) : value
+      if (setOpenProp) {
+        setOpenProp(openState)
+      } else {
+        _setOpen(openState)
+      }
+
+      // This sets the cookie to keep the sidebar state.
+      document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`
+    },
+    [setOpenProp, open]
+  )
+
+  // Helper to toggle the sidebar.
+  const toggleSidebar = React.useCallback(() => {
+    return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open)
+  }, [isMobile, setOpen, setOpenMobile])
+
+  // Adds a keyboard shortcut to toggle the sidebar.
+  React.useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (
+        event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+        (event.metaKey || event.ctrlKey)
+      ) {
+        event.preventDefault()
+        toggleSidebar()
+      }
+    }
+
+    window.addEventListener("keydown", handleKeyDown)
+    return () => window.removeEventListener("keydown", handleKeyDown)
+  }, [toggleSidebar])
+
+  // We add a state so that we can do data-state="expanded" or "collapsed".
+  // This makes it easier to style the sidebar with Tailwind classes.
+  const state = open ? "expanded" : "collapsed"
+
+  const contextValue = React.useMemo<SidebarContextProps>(
+    () => ({
+      state,
+      open,
+      setOpen,
+      isMobile,
+      openMobile,
+      setOpenMobile,
+      toggleSidebar,
+    }),
+    [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]
+  )
+
+  return (
+    <SidebarContext.Provider value={contextValue}>
+      <TooltipProvider delayDuration={0}>
+        <div
+          data-slot="sidebar-wrapper"
+          style={
+            {
+              "--sidebar-width": SIDEBAR_WIDTH,
+              "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
+              ...style,
+            } as React.CSSProperties
+          }
+          className={cn(
+            "group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full",
+            className
+          )}
+          {...props}
+        >
+          {children}
+        </div>
+      </TooltipProvider>
+    </SidebarContext.Provider>
+  )
+}
+
+function Sidebar({
+  side = "left",
+  variant = "sidebar",
+  collapsible = "offcanvas",
+  className,
+  children,
+  ...props
+}: React.ComponentProps<"div"> & {
+  side?: "left" | "right"
+  variant?: "sidebar" | "floating" | "inset"
+  collapsible?: "offcanvas" | "icon" | "none"
+}) {
+  const { isMobile, state, openMobile, setOpenMobile } = useSidebar()
+
+  if (collapsible === "none") {
+    return (
+      <div
+        data-slot="sidebar"
+        className={cn(
+          "bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col",
+          className
+        )}
+        {...props}
+      >
+        {children}
+      </div>
+    )
+  }
+
+  if (isMobile) {
+    return (
+      <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+        <SheetContent
+          data-sidebar="sidebar"
+          data-slot="sidebar"
+          data-mobile="true"
+          className="bg-sidebar text-sidebar-foreground w-(--sidebar-width) p-0 [&>button]:hidden"
+          style={
+            {
+              "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
+            } as React.CSSProperties
+          }
+          side={side}
+        >
+          <SheetHeader className="sr-only">
+            <SheetTitle>Sidebar</SheetTitle>
+            <SheetDescription>Displays the mobile sidebar.</SheetDescription>
+          </SheetHeader>
+          <div className="flex h-full w-full flex-col">{children}</div>
+        </SheetContent>
+      </Sheet>
+    )
+  }
+
+  return (
+    <div
+      className="group peer text-sidebar-foreground hidden md:block"
+      data-state={state}
+      data-collapsible={state === "collapsed" ? collapsible : ""}
+      data-variant={variant}
+      data-side={side}
+      data-slot="sidebar"
+    >
+      {/* This is what handles the sidebar gap on desktop */}
+      <div
+        data-slot="sidebar-gap"
+        className={cn(
+          "relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear",
+          "group-data-[collapsible=offcanvas]:w-0",
+          "group-data-[side=right]:rotate-180",
+          variant === "floating" || variant === "inset"
+            ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"
+            : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)"
+        )}
+      />
+      <div
+        data-slot="sidebar-container"
+        className={cn(
+          "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
+          side === "left"
+            ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
+            : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
+          // Adjust the padding for floating and inset variants.
+          variant === "floating" || variant === "inset"
+            ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
+            : "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
+          className
+        )}
+        {...props}
+      >
+        <div
+          data-sidebar="sidebar"
+          data-slot="sidebar-inner"
+          className="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm"
+        >
+          {children}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+function SidebarTrigger({
+  className,
+  onClick,
+  ...props
+}: React.ComponentProps<typeof Button>) {
+  const { toggleSidebar } = useSidebar()
+
+  return (
+    <Button
+      data-sidebar="trigger"
+      data-slot="sidebar-trigger"
+      variant="ghost"
+      size="icon"
+      className={cn("size-7", className)}
+      onClick={(event) => {
+        onClick?.(event)
+        toggleSidebar()
+      }}
+      {...props}
+    >
+      <PanelLeftIcon />
+      <span className="sr-only">Toggle Sidebar</span>
+    </Button>
+  )
+}
+
+function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
+  const { toggleSidebar } = useSidebar()
+
+  return (
+    <button
+      data-sidebar="rail"
+      data-slot="sidebar-rail"
+      aria-label="Toggle Sidebar"
+      tabIndex={-1}
+      onClick={toggleSidebar}
+      title="Toggle Sidebar"
+      className={cn(
+        "hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex",
+        "in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
+        "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
+        "hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
+        "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
+        "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
+  return (
+    <main
+      data-slot="sidebar-inset"
+      className={cn(
+        "bg-background relative flex w-full flex-1 flex-col",
+        "md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof Input>) {
+  return (
+    <Input
+      data-slot="sidebar-input"
+      data-sidebar="input"
+      className={cn("bg-background h-8 w-full shadow-none", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-header"
+      data-sidebar="header"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-footer"
+      data-sidebar="footer"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof Separator>) {
+  return (
+    <Separator
+      data-slot="sidebar-separator"
+      data-sidebar="separator"
+      className={cn("bg-sidebar-border mx-2 w-auto", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-content"
+      data-sidebar="content"
+      className={cn(
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-group"
+      data-sidebar="group"
+      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarGroupLabel({
+  className,
+  asChild = false,
+  ...props
+}: React.ComponentProps<"div"> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : "div"
+
+  return (
+    <Comp
+      data-slot="sidebar-group-label"
+      data-sidebar="group-label"
+      className={cn(
+        "text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+        "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarGroupAction({
+  className,
+  asChild = false,
+  ...props
+}: React.ComponentProps<"button"> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : "button"
+
+  return (
+    <Comp
+      data-slot="sidebar-group-action"
+      data-sidebar="group-action"
+      className={cn(
+        "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:absolute after:-inset-2 md:after:hidden",
+        "group-data-[collapsible=icon]:hidden",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarGroupContent({
+  className,
+  ...props
+}: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-group-content"
+      data-sidebar="group-content"
+      className={cn("w-full text-sm", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
+  return (
+    <ul
+      data-slot="sidebar-menu"
+      data-sidebar="menu"
+      className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
+  return (
+    <li
+      data-slot="sidebar-menu-item"
+      data-sidebar="menu-item"
+      className={cn("group/menu-item relative", className)}
+      {...props}
+    />
+  )
+}
+
+const sidebarMenuButtonVariants = cva(
+  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+  {
+    variants: {
+      variant: {
+        default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
+        outline:
+          "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
+      },
+      size: {
+        default: "h-8 text-sm",
+        sm: "h-7 text-xs",
+        lg: "h-12 text-sm group-data-[collapsible=icon]:p-0!",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+function SidebarMenuButton({
+  asChild = false,
+  isActive = false,
+  variant = "default",
+  size = "default",
+  tooltip,
+  className,
+  ...props
+}: React.ComponentProps<"button"> & {
+  asChild?: boolean
+  isActive?: boolean
+  tooltip?: string | React.ComponentProps<typeof TooltipContent>
+} & VariantProps<typeof sidebarMenuButtonVariants>) {
+  const Comp = asChild ? Slot : "button"
+  const { isMobile, state } = useSidebar()
+
+  const button = (
+    <Comp
+      data-slot="sidebar-menu-button"
+      data-sidebar="menu-button"
+      data-size={size}
+      data-active={isActive}
+      className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+      {...props}
+    />
+  )
+
+  if (!tooltip) {
+    return button
+  }
+
+  if (typeof tooltip === "string") {
+    tooltip = {
+      children: tooltip,
+    }
+  }
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>{button}</TooltipTrigger>
+      <TooltipContent
+        side="right"
+        align="center"
+        hidden={state !== "collapsed" || isMobile}
+        {...tooltip}
+      />
+    </Tooltip>
+  )
+}
+
+function SidebarMenuAction({
+  className,
+  asChild = false,
+  showOnHover = false,
+  ...props
+}: React.ComponentProps<"button"> & {
+  asChild?: boolean
+  showOnHover?: boolean
+}) {
+  const Comp = asChild ? Slot : "button"
+
+  return (
+    <Comp
+      data-slot="sidebar-menu-action"
+      data-sidebar="menu-action"
+      className={cn(
+        "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground peer-hover/menu-button:text-sidebar-accent-foreground absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:absolute after:-inset-2 md:after:hidden",
+        "peer-data-[size=sm]/menu-button:top-1",
+        "peer-data-[size=default]/menu-button:top-1.5",
+        "peer-data-[size=lg]/menu-button:top-2.5",
+        "group-data-[collapsible=icon]:hidden",
+        showOnHover &&
+          "peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenuBadge({
+  className,
+  ...props
+}: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="sidebar-menu-badge"
+      data-sidebar="menu-badge"
+      className={cn(
+        "text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums select-none",
+        "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
+        "peer-data-[size=sm]/menu-button:top-1",
+        "peer-data-[size=default]/menu-button:top-1.5",
+        "peer-data-[size=lg]/menu-button:top-2.5",
+        "group-data-[collapsible=icon]:hidden",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenuSkeleton({
+  className,
+  showIcon = false,
+  ...props
+}: React.ComponentProps<"div"> & {
+  showIcon?: boolean
+}) {
+  // Random width between 50 to 90%.
+  const width = React.useMemo(() => {
+    return `${Math.floor(Math.random() * 40) + 50}%`
+  }, [])
+
+  return (
+    <div
+      data-slot="sidebar-menu-skeleton"
+      data-sidebar="menu-skeleton"
+      className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
+      {...props}
+    >
+      {showIcon && (
+        <Skeleton
+          className="size-4 rounded-md"
+          data-sidebar="menu-skeleton-icon"
+        />
+      )}
+      <Skeleton
+        className="h-4 max-w-(--skeleton-width) flex-1"
+        data-sidebar="menu-skeleton-text"
+        style={
+          {
+            "--skeleton-width": width,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  )
+}
+
+function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
+  return (
+    <ul
+      data-slot="sidebar-menu-sub"
+      data-sidebar="menu-sub"
+      className={cn(
+        "border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5",
+        "group-data-[collapsible=icon]:hidden",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenuSubItem({
+  className,
+  ...props
+}: React.ComponentProps<"li">) {
+  return (
+    <li
+      data-slot="sidebar-menu-sub-item"
+      data-sidebar="menu-sub-item"
+      className={cn("group/menu-sub-item relative", className)}
+      {...props}
+    />
+  )
+}
+
+function SidebarMenuSubButton({
+  asChild = false,
+  size = "md",
+  isActive = false,
+  className,
+  ...props
+}: React.ComponentProps<"a"> & {
+  asChild?: boolean
+  size?: "sm" | "md"
+  isActive?: boolean
+}) {
+  const Comp = asChild ? Slot : "a"
+
+  return (
+    <Comp
+      data-slot="sidebar-menu-sub-button"
+      data-sidebar="menu-sub-button"
+      data-size={size}
+      data-active={isActive}
+      className={cn(
+        "text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground [&>svg]:text-sidebar-accent-foreground flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 outline-hidden focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+        "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
+        size === "sm" && "text-xs",
+        size === "md" && "text-sm",
+        "group-data-[collapsible=icon]:hidden",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+}

src/components/ui/skeleton.tsx

@@ -0,0 +1,13 @@
+import { cn } from "@root/lib/utils"
+
+function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="skeleton"
+      className={cn("bg-accent animate-pulse rounded-md", className)}
+      {...props}
+    />
+  )
+}
+
+export { Skeleton }

src/locales/en.json

@@ -662,5 +662,8 @@
   "Main Toggle Action": "Main Toggle Action",
   "Support": "Support",
   "Update on Startup": "Update on Startup",
-  "Send HWID": "Send HWID"
+  "Send HWID": "Send HWID",
+  "New Version is available": "New Version is available",
+  "New Version": "New Version",
+  "New update": "New update"
 }

src/locales/ru.json

@@ -614,5 +614,8 @@
   "Main Toggle Action": "Действие главного переключателя",
   "Support": "Поддержка",
   "Update on Startup": "Обновлять при запуске",
-  "Send HWID": "Отправлять HWID"
+  "Send HWID": "Отправлять HWID",
+  "New Version is available": "Доступна новая версия",
+  "New Version": "Новая версия",
+  "New update": "Доступно обновление"
 }

src/pages/_layout.tsx

@@ -5,23 +5,15 @@ import { SWRConfig, mutate } from "swr";
 import { useEffect, useCallback, useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useRoutes, useNavigate } from "react-router-dom";
-import { List, Paper, ThemeProvider, SvgIcon } from "@mui/material";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { routers } from "./_routers";
 import { getAxios } from "@/services/api";
 import { useVerge } from "@/hooks/use-verge";
-import LogoSvg from "@/assets/image/logo.svg?react";
-import iconLight from "@/assets/image/icon_light.svg?react";
-import iconDark from "@/assets/image/icon_dark.svg?react";
 import { useThemeMode, useEnableLog } from "@/services/states";
-import { LayoutItem } from "@/components/layout/layout-item";
-import { LayoutTraffic } from "@/components/layout/layout-traffic";
-import { UpdateButton } from "@/components/layout/update-button";
 import { useCustomTheme } from "@/components/layout/use-custom-theme";
 import getSystem from "@/utils/get-system";
 import "dayjs/locale/ru";
 import "dayjs/locale/zh-cn";
-import { getPortableFlag } from "@/services/cmds";
 import React from "react";
 import { useListen } from "@/hooks/use-listen";
 import { listen } from "@tauri-apps/api/event";
@@ -30,6 +22,8 @@ import { initGlobalLogService } from "@/services/global-log-service";
 import { invoke } from "@tauri-apps/api/core";
 import { showNotice } from "@/services/noticeService";
 import { NoticeManager } from "@/components/base/NoticeManager";
+import { SidebarProvider, useSidebar } from "@/components/ui/sidebar";
+import { AppSidebar } from "@/components/layout/sidebar";
 
 const appWindow = getCurrentWebviewWindow();
 export let portableFlag = false;
@@ -38,21 +32,21 @@ dayjs.extend(relativeTime);
 
 const OS = getSystem();
 
-// 通知处理函数
+// Notification Handler
 const handleNoticeMessage = (
   status: string,
   msg: string,
   t: (key: string) => string,
   navigate: (path: string, options?: any) => void,
 ) => {
-  console.log("[通知监听 V2] 收到消息:", status, msg);
+  console.log("[Notification Listener V2] Receiving a message:", status, msg);
 
   switch (status) {
     case "import_sub_url::ok":
       mutate("getProfiles");
-      navigate("/", { state: { activateProfile: msg } });
+      navigate("/");
       showNotice("success", t("Import Subscription Successful"));
-      window.dispatchEvent(new CustomEvent('activate-profile', { detail: msg }));
+      sessionStorage.setItem('activateProfile', msg);
       break;
     case "import_sub_url::error":
       showNotice("error", msg);
@@ -142,7 +136,7 @@ const handleNoticeMessage = (
       showNotice("error", `${t("Failed to Change Core")}: ${msg}`);
       break;
     default: // Optional: Log unhandled statuses
-      console.warn(`[通知监听 V2] 未处理的状态: ${status}`);
+      console.warn(`[Notification Listener V2] Unprocessed state: ${status}`);
       break;
   }
 };
@@ -169,14 +163,14 @@ const Layout = () => {
         try {
           handleNoticeMessage(status, msg, t, navigate);
         } catch (error) {
-          console.error("[Layout] 处理通知消息失败:", error);
+          console.error("[Layout] Failure to process a notification message:", error);
         }
       }, 0);
     },
     [t, navigate],
   );
 
-  // 初始化全局日志服务
+  // Initialize the global logging service
   useEffect(() => {
     if (clashInfo) {
       const { server = "", secret = "" } = clashInfo;
@@ -184,7 +178,7 @@ const Layout = () => {
     }
   }, [clashInfo, enableLog]);
 
-  // 设置监听器
+  // Setting up a listener
   useEffect(() => {
     const listeners = [
       addListener("verge://refresh-clash-config", async () => {
@@ -230,11 +224,11 @@ const Layout = () => {
                 try {
                   unlisten();
                 } catch (error) {
-                  console.error("[Layout] 清理事件监听器失败:", error);
+                  console.error("[Layout] Failed to clear event listener:", error);
                 }
               })
               .catch((error) => {
-                console.error("[Layout] 获取unlisten函数失败:", error);
+                console.error("[Layout] Failed to get unlisten function:", error);
               });
           }
         });
@@ -244,11 +238,11 @@ const Layout = () => {
             try {
               cleanup();
             } catch (error) {
-              console.error("[Layout] 清理窗口监听器失败:", error);
+              console.error("[Layout] Failed to clear window listener:", error);
             }
           })
           .catch((error) => {
-            console.error("[Layout] 获取cleanup函数失败:", error);
+            console.error("[Layout] Failed to get cleanup function:", error);
           });
       }, 0);
     };
@@ -256,10 +250,10 @@ const Layout = () => {
 
   useEffect(() => {
     if (initRef.current) {
-      console.log("[Layout] 初始化代码已执行过，跳过");
+      console.log("[Layout] Initialization code has already been executed, skip");
       return;
     }
-    console.log("[Layout] 开始执行初始化代码");
+    console.log("[Layout] Begin executing initialization code");
     initRef.current = true;
 
     let isInitialized = false;
@@ -269,27 +263,27 @@ const Layout = () => {
     const notifyBackend = async (action: string, stage?: string) => {
       try {
         if (stage) {
-          console.log(`[Layout] 通知后端 ${action}: ${stage}`);
+          console.log(`[Layout] Notification Backend ${action}: ${stage}`);
           await invoke("update_ui_stage", { stage });
         } else {
-          console.log(`[Layout] 通知后端 ${action}`);
+          console.log(`[Layout] Notification Backend ${action}`);
           await invoke("notify_ui_ready");
         }
       } catch (err) {
-        console.error(`[Layout] 通知失败 ${action}:`, err);
+        console.error(`[Layout] Notification failure ${action}:`, err);
       }
     };
 
     const removeLoadingOverlay = () => {
       const initialOverlay = document.getElementById("initial-loading-overlay");
       if (initialOverlay) {
-        console.log("[Layout] 移除加载指示器");
+        console.log("[Layout] Remove loading indicator");
         initialOverlay.style.opacity = "0";
         setTimeout(() => {
           try {
             initialOverlay.remove();
           } catch (e) {
-            console.log("[Layout] 加载指示器已被移除");
+            console.log("[Layout] Load indicator has been removed");
           }
         }, 300);
       }
@@ -297,23 +291,23 @@ const Layout = () => {
 
     const performInitialization = async () => {
       if (isInitialized) {
-        console.log("[Layout] 已经初始化过，跳过");
+        console.log("[Layout] Already initialized, skip");
         return;
       }
 
       initializationAttempts++;
-      console.log(`[Layout] 开始第 ${initializationAttempts} 次初始化尝试`);
+      console.log(`[Layout] Start ${initializationAttempts} for the first time`);
 
       try {
         removeLoadingOverlay();
 
-        await notifyBackend("加载阶段", "Loading");
+        await notifyBackend("Loading phase", "Loading");
 
         await new Promise<void>((resolve) => {
           const checkReactMount = () => {
             const rootElement = document.getElementById("root");
             if (rootElement && rootElement.children.length > 0) {
-              console.log("[Layout] React组件已挂载");
+              console.log("[Layout] React components are mounted");
               resolve();
             } else {
               setTimeout(checkReactMount, 50);
@@ -323,43 +317,43 @@ const Layout = () => {
           checkReactMount();
 
           setTimeout(() => {
-            console.log("[Layout] React组件挂载检查超时，继续执行");
+            console.log("[Layout] React components mount check timeout, continue execution");
             resolve();
           }, 2000);
         });
 
-        await notifyBackend("DOM就绪", "DomReady");
+        await notifyBackend("DOM ready", "DomReady");
 
         await new Promise<void>((resolve) => {
           requestAnimationFrame(() => resolve());
         });
 
-        await notifyBackend("资源加载完成", "ResourcesLoaded");
+        await notifyBackend("Resource loading completed", "ResourcesLoaded");
 
-        await notifyBackend("UI就绪");
+        await notifyBackend("UI ready");
 
         isInitialized = true;
-        console.log(`[Layout] 第 ${initializationAttempts} 次初始化完成`);
+        console.log(`[Layout] The ${initializationAttempts} initialization is complete`);
       } catch (error) {
         console.error(
-          `[Layout] 第 ${initializationAttempts} 次初始化失败:`,
+          `[Layout] Initialization failure at ${initializationAttempts}:`,
           error,
         );
 
         if (initializationAttempts < maxAttempts) {
           console.log(
-            `[Layout] 将在500ms后进行第 ${initializationAttempts + 1} 次重试`,
+            `[Layout] The first ${initializationAttempts + 1} retry will be made after 500ms`,
           );
           setTimeout(performInitialization, 500);
         } else {
-          console.error("[Layout] 所有初始化尝试都失败，执行紧急初始化");
+          console.error("[Layout] All initialization attempts fail, perform emergency initialization");
 
           removeLoadingOverlay();
           try {
-            await notifyBackend("UI就绪");
+            await notifyBackend("UI ready");
             isInitialized = true;
           } catch (e) {
-            console.error("[Layout] 紧急初始化也失败:", e);
+            console.error("[Layout] Emergency initialization also failed:", e);
           }
         }
       }
@@ -369,39 +363,39 @@ const Layout = () => {
 
     const setupEventListener = async () => {
       try {
-        console.log("[Layout] 开始监听启动完成事件");
+        console.log("[Layout] Start listening for startup completion events");
         const unlisten = await listen("verge://startup-completed", () => {
           if (!hasEventTriggered) {
-            console.log("[Layout] 收到启动完成事件，开始初始化");
+            console.log("[Layout] Receive startup completion event, start initialization");
             hasEventTriggered = true;
             performInitialization();
           }
         });
         return unlisten;
       } catch (err) {
-        console.error("[Layout] 监听启动完成事件失败:", err);
+        console.error("[Layout] Failed to listen for startup completion event:", err);
         return () => {};
       }
     };
 
     const checkImmediateInitialization = async () => {
       try {
-        console.log("[Layout] 检查后端是否已就绪");
+        console.log("[Layout] Check if the backend is ready");
         await invoke("update_ui_stage", { stage: "Loading" });
 
         if (!hasEventTriggered && !isInitialized) {
-          console.log("[Layout] 后端已就绪，立即开始初始化");
+          console.log("[Layout] Backend is ready, start initialization immediately");
           hasEventTriggered = true;
           performInitialization();
         }
       } catch (err) {
-        console.log("[Layout] 后端尚未就绪，等待启动完成事件");
+        console.log("[Layout] Backend not yet ready, waiting for startup completion event");
       }
     };
 
     const backupInitialization = setTimeout(() => {
       if (!hasEventTriggered && !isInitialized) {
-        console.warn("[Layout] 备用初始化触发：1.5秒内未开始初始化");
+        console.warn("[Layout] Standby initialization trigger: initialization not started within 1.5 seconds");
         hasEventTriggered = true;
         performInitialization();
       }
@@ -409,9 +403,9 @@ const Layout = () => {
 
     const emergencyInitialization = setTimeout(() => {
       if (!isInitialized) {
-        console.error("[Layout] 紧急初始化触发：5秒内未完成初始化");
+        console.error("[Layout] Emergency initialization trigger: initialization not completed within 5 seconds");
         removeLoadingOverlay();
-        notifyBackend("UI就绪").catch(() => {});
+        notifyBackend("UI ready").catch(() => {});
         isInitialized = true;
       }
     }, 5000);
@@ -427,10 +421,10 @@ const Layout = () => {
     };
   }, []);
 
-  // 语言和起始页设置
+  // Language and start page settings
   useEffect(() => {
     if (language) {
-      dayjs.locale(language === "zh" ? "zh-cn" : language);
+      dayjs.locale(language === "ru" ? "ru-ru" : language);
       i18next.changeLanguage(language);
     }
   }, [language]);
@@ -442,17 +436,36 @@ const Layout = () => {
   }, [start_page]);
 
   if (!routersEles) {
-    return <div className="h-screen w-screen bg-background" />;
+      return <div className="h-screen w-screen bg-background" />;
   }
 
+  const AppLayout = () => {
+    const { state, isMobile } = useSidebar();
+    const location = useLocation();
+    const routersEles = useRoutes(routers);
+
+    return (
+        <>
+            <AppSidebar />
+            <main
+                className="h-screen w-full overflow-y-auto transition-[margin] duration-200 ease-linear"
+            >
+                <div className="h-full w-full relative">
+                    {routersEles && React.cloneElement(routersEles, { key: location.pathname })}
+                </div>
+            </main>
+        </>
+    );
+};
+
+
+
   return (
     <SWRConfig value={{ errorRetryCount: 3 }}>
       <NoticeManager />
-      <div className="h-screen w-screen bg-background text-foreground overflow-hidden">
+      <SidebarProvider defaultOpen={false}>
-        <div className="h-full w-full relative">
+        <AppLayout />
-          {React.cloneElement(routersEles, { key: location.pathname })}
+      </SidebarProvider>
-        </div>
-      </div>
     </SWRConfig>
   );
 };

src/pages/connections.tsx

@@ -8,7 +8,6 @@ import React, {
 import { useLockFn } from "ahooks";
 import { Virtuoso } from "react-virtuoso";
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
 import { useConnectionSetting } from "@/services/states";
 import { useVisibility } from "@/hooks/use-visibility";
 import { useAppData } from "@/providers/app-data-provider";
@@ -16,7 +15,6 @@ import { closeAllConnections } from "@/services/api";
 import parseTraffic from "@/utils/parse-traffic";
 import { cn } from "@root/lib/utils";
 
-// Компоненты
 import { BaseEmpty } from "@/components/base";
 import { ConnectionItem } from "@/components/connection/connection-item";
 import { ConnectionTable } from "@/components/connection/connection-table";
@@ -26,7 +24,6 @@ import {
 } from "@/components/connection/connection-detail";
 import {
   BaseSearchBox,
-  type SearchState,
 } from "@/components/base/base-search-box";
 import { Button } from "@/components/ui/button";
 import {
@@ -36,14 +33,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import {
+
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { Separator } from "@/components/ui/separator";
 import {
   Tooltip,
@@ -52,7 +42,6 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 
-// Иконки
 import {
   List,
   Table2,
@@ -62,6 +51,7 @@ import {
   ArrowUp,
   Menu,
 } from "lucide-react";
+import {SidebarTrigger} from "@/components/ui/sidebar";
 
 const initConn: IConnections = {
   uploadTotal: 0,
@@ -73,7 +63,6 @@ type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
 
 const ConnectionsPage = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
   const pageVisible = useVisibility();
   const [match, setMatch] = useState(() => (_: string) => true);
   const [curOrderOpt, setOrderOpt] = useState("Default");
@@ -166,15 +155,6 @@ const ConnectionsPage = () => {
     });
   }, [connections]);
 
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Profiles"), path: "/profile" },
-    { label: t("Settings"), path: "/settings" },
-    { label: t("Logs"), path: "/logs" },
-    { label: t("Proxies"), path: "/proxies" },
-    { label: t("Rules"), path: "/rules" },
-  ];
-
   return (
     <div className="h-full w-full relative">
       <div
@@ -184,6 +164,9 @@ const ConnectionsPage = () => {
         )}
       >
         <div className="flex justify-between items-center">
+          <div className="w-10">
+            <SidebarTrigger />
+          </div>
           <h2 className="text-2xl font-semibold tracking-tight">
             {t("Connections")}
           </h2>
@@ -245,26 +228,6 @@ const ConnectionsPage = () => {
               <Button size="sm" variant="destructive" onClick={onCloseAll}>
                 {t("Close All")}
               </Button>
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="ghost" size="icon" title={t("Menu")}>
-                    <Menu className="h-5 w-5" />
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="end">
-                  <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-                  <DropdownMenuSeparator />
-                  {menuItems.map((item) => (
-                    <DropdownMenuItem
-                      key={item.path}
-                      onSelect={() => navigate(item.path)}
-                      disabled={location.pathname === item.path}
-                    >
-                      {item.label}
-                    </DropdownMenuItem>
-                  ))}
-                </DropdownMenuContent>
-              </DropdownMenu>
             </div>
           </TooltipProvider>
         </div>

src/pages/home.tsx

@@ -1,5 +1,4 @@
 import React, {useRef, useMemo, useCallback, useState, useEffect} from "react";
-import { useLocation, useNavigate } from "react-router-dom";
 import { useLockFn } from "ahooks";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
@@ -22,7 +21,6 @@ import {
   ChevronsUpDown,
   Check,
   PlusCircle,
-  Menu,
   Wrench,
   AlertTriangle,
   Loader2,
@@ -38,10 +36,10 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { closeAllConnections } from "@/services/api";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { updateProfile } from "@/services/cmds";
+import { SidebarTrigger } from "@/components/ui/sidebar";
 
 const MinimalHomePage: React.FC = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
   const [isToggling, setIsToggling] = useState(false);
   const [isUpdating, setIsUpdating] = useState(false);
   const { profiles, patchProfiles, activateSelected, mutateProfiles } =
@@ -80,26 +78,13 @@ const MinimalHomePage: React.FC = () => {
   );
 
   useEffect(() => {
-    const handleActivationEvent = (event: Event) => {
+    const uidToActivate = sessionStorage.getItem('activateProfile');
-      const customEvent = event as CustomEvent<string>;
-      const profileId = customEvent.detail;
-      if (profileId) {
-        setUidToActivate(profileId);
-      }
-    };
-
-    window.addEventListener('activate-profile', handleActivationEvent);
-    return () => {
-      window.removeEventListener('activate-profile', handleActivationEvent);
-    };
-  }, []);
-
-  useEffect(() => {
     if (uidToActivate && profileItems.some(p => p.uid === uidToActivate)) {
       activateProfile(uidToActivate, false);
-      setUidToActivate(null);
+      sessionStorage.removeItem('activateProfile');
     }
-  }, [uidToActivate, profileItems, activateProfile]);
+  }, [profileItems, activateProfile]);
+
 
   const handleProfileChange = useLockFn(async (uid: string) => {
     if (profiles?.current === uid) return;
@@ -167,29 +152,19 @@ const MinimalHomePage: React.FC = () => {
     }
   });
 
-  const navMenuItems = [
-    { label: "Profiles", path: "/profile" },
-    { label: "Settings", path: "/settings" },
-    { label: "Logs", path: "/logs" },
-    { label: "Proxies", path: "/proxies" },
-    { label: "Connections", path: "/connections" },
-    { label: "Rules", path: "/rules" },
-  ];
-
   return (
-    <div className="flex flex-col h-screen p-5">
+    <div className="h-full w-full flex flex-col">
-      <header className="absolute top-0 left-0 right-0 p-5 flex items-center justify-between z-20">
+      <header className="flex-shrink-0 p-5 grid grid-cols-3 items-center z-10">
-        <div className="w-10"></div>
+        <div className="flex justify-start">
-        <div className="flex flex-col items-center gap-2">
+          <SidebarTrigger />
-          <div className="flex items-center gap-2">
+        </div>
+       <div className="justify-self-center flex flex-col items-center gap-2">
+          <div className="relative">
             {profileItems.length > 0 && (
               <div className="flex-shrink-0">
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild>
-                    <Button
+                    <Button variant="outline" className="w-full max-w-[250px] sm:max-w-xs">
-                      variant="outline"
-                      className="w-full max-w-[250px] sm:max-w-xs"
-                    >
                       <span className="truncate">{currentProfileName}</span>
                       <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
                     </Button>
@@ -218,72 +193,48 @@ const MinimalHomePage: React.FC = () => {
               </div>
             )}
              {currentProfile?.type === 'remote' && (
-              <TooltipProvider>
+              <div className="absolute top-1/2 -translate-y-1/2 left-full ml-2">
-                <Tooltip>
+                <TooltipProvider>
-                  <TooltipTrigger asChild>
+                  <Tooltip>
-                    <Button
+                    <TooltipTrigger asChild>
-                      variant="ghost"
+                      <Button
-                      size="icon"
+                        variant="ghost"
-                      onClick={handleUpdateProfile}
+                        size="icon"
-                      disabled={isUpdating}
+                        onClick={handleUpdateProfile}
-                      className="flex-shrink-0"
+                        disabled={isUpdating}
-                    >
+                        className="flex-shrink-0"
-                      {isUpdating ? (
+                      >
-                        <Loader2 className="h-5 w-5 animate-spin" />
+                        {isUpdating ? <Loader2 className="h-5 w-5 animate-spin" /> : <RefreshCw className="h-5 w-5" />}
-                      ) : (
+                      </Button>
-                        <RefreshCw className="h-5 w-5" />
+                    </TooltipTrigger>
-                      )}
+                    <TooltipContent><p>{t("Update Profile")}</p></TooltipContent>
-                    </Button>
+                  </Tooltip>
-                  </TooltipTrigger>
+                </TooltipProvider>
-                  <TooltipContent>
+              </div>
-                    <p>{t("Update")}</p>
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
             )}
           </div>
         </div>
-
+        <div className="flex justify-end">
-        <div className="w-10">
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button variant="outline" size="icon">
-                <Menu className="h-5 w-5" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-              <DropdownMenuSeparator />
-              {navMenuItems.map((item) => (
-                <DropdownMenuItem
-                  key={item.path}
-                  onSelect={() => navigate(item.path)}
-                >
-                  {t(item.label)}
-                </DropdownMenuItem>
-              ))}
-            </DropdownMenuContent>
-          </DropdownMenu>
         </div>
       </header>
 
-      <div className="flex items-center justify-center flex-grow w-full">
+      <main className="flex-1 overflow-y-auto flex items-center justify-center">
-        <div className="flex flex-col items-center gap-8 pt-10">
+          <div className="relative flex flex-col items-center gap-8 py-10 w-full max-w-4xl px-4">
           {currentProfile?.announce && (
-            <div className="flex-shrink-0 flex justify-center text-center px-5">
+            <div className="absolute -top-15 w-full flex justify-center text-center max-w-lg">
               {currentProfile.announce_url ? (
                 <a
                   href={currentProfile.announce_url}
                   target="_blank"
                   rel="noopener noreferrer"
-                  className="inline-flex items-center gap-2 text-base font-semibold text-foreground hover:underline hover:opacity-80 transition-all"
+                  className="inline-flex items-center gap-2 text-base font-semibold text-foreground hover:underline hover:opacity-80 transition-all whitespace-pre-wrap"
-                  title={currentProfile.announce_url}
+                  title={currentProfile.announce_url.replace(/\\n/g, '\n')}
                 >
-                  <span>{currentProfile.announce}</span>
+                  <span>{currentProfile.announce.replace(/\\n/g, '\n')}</span>
                   <ExternalLink className="h-4 w-4 flex-shrink-0" />
                 </a>
               ) : (
-                <p className="text-base font-semibold text-foreground max-w-lg">
+                <p className="text-base font-semibold text-foreground whitespace-pre-wrap">
                   {currentProfile.announce}
                 </p>
               )}
@@ -304,7 +255,7 @@ const MinimalHomePage: React.FC = () => {
 
           <div className="scale-[7] my-16">
             <Switch
-              disabled={showTunAlert || isToggling}
+              disabled={showTunAlert || isToggling || profileItems.length === 0}
               checked={!!isProxyEnabled}
               onCheckedChange={handleToggleProxy}
               aria-label={t("Toggle Proxy")}
@@ -357,8 +308,8 @@ const MinimalHomePage: React.FC = () => {
               </Alert>
             )}
           </div>
-        </div>
       </div>
+      </main>
       <footer className="flex justify-center p-4 flex-shrink-0">
         {currentProfile?.support_url && (
             <div className="flex items-center gap-2 text-sm text-muted-foreground">

src/pages/logs.tsx

@@ -1,5 +1,3 @@
-// LogPage.tsx
-
 import React, {
   useMemo,
   useState,
@@ -10,8 +8,7 @@ import React, {
 import { Virtuoso } from "react-virtuoso";
 import { useTranslation } from "react-i18next";
 import { useLocalStorage } from "foxact/use-local-storage";
-import { useNavigate } from "react-router-dom";
+import { Play, Pause, Trash2 } from "lucide-react";
-import { Play, Pause, Trash2, Menu } from "lucide-react";
 import { LogLevel } from "@/hooks/use-log-data";
 import { useClashInfo } from "@/hooks/use-clash";
 import { useEnableLog } from "@/services/states";
@@ -34,18 +31,10 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import {
+import {SidebarTrigger} from "@/components/ui/sidebar";
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 
 const LogPage = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
   const [enableLog, setEnableLog] = useEnableLog();
   const { clashInfo } = useClashInfo();
   const [logLevel, setLogLevel] = useLocalStorage<LogLevel>(
@@ -104,28 +93,16 @@ const LogPage = () => {
     [],
   );
 
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Profiles"), path: "/profile" },
-    { label: t("Settings"), path: "/settings" },
-    { label: t("Proxies"), path: "/proxies" },
-    { label: t("Connections"), path: "/connections" },
-    { label: t("Rules"), path: "/rules" },
-  ];
-
   return (
     <div className="h-full w-full relative">
-      {/* "Липкая" шапка */}
       <div
         className={cn(
           "absolute top-0 left-0 right-0 z-10 p-4 transition-all duration-200",
-          // --- НАЧАЛО ИЗМЕНЕНИЙ ---
-          // Вместо блюра делаем солидный фон с тенью при прокрутке
           { "bg-background shadow-md": isScrolled },
-          // --- КОНЕЦ ИЗМЕНЕНИЙ ---
         )}
       >
         <div className="flex justify-between items-center mb-4">
+          <SidebarTrigger />
           <h2 className="text-2xl font-semibold tracking-tight">{t("Logs")}</h2>
           <div className="flex items-center gap-2">
             <Button
@@ -146,26 +123,6 @@ const LogPage = () => {
                 {t("Clear")}
               </Button>
             )}
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button variant="ghost" size="icon" title={t("Menu")}>
-                  <Menu className="h-5 w-5" />
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="end">
-                <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                {menuItems.map((item) => (
-                  <DropdownMenuItem
-                    key={item.path}
-                    onSelect={() => navigate(item.path)}
-                    disabled={location.pathname === item.path}
-                  >
-                    {item.label}
-                  </DropdownMenuItem>
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
           </div>
         </div>
         <div className="flex items-center space-x-2">
@@ -187,7 +144,6 @@ const LogPage = () => {
         </div>
       </div>
 
-      {/* Возвращаем Virtuoso на место */}
       <div
         ref={scrollContainerRef}
         className="absolute top-0 left-0 right-0 bottom-0 pt-32 overflow-y-auto"

src/pages/profiles.tsx

@@ -41,14 +41,12 @@ import { ConfigViewer } from "@/components/setting/mods/config-viewer";
 import { throttle } from "lodash-es";
 import { readTextFile } from "@tauri-apps/plugin-fs";
 import { readText } from "@tauri-apps/plugin-clipboard-manager";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 import { useListen } from "@/hooks/use-listen";
 import { listen, TauriEvent } from "@tauri-apps/api/event";
 import { showNotice } from "@/services/noticeService";
 import { cn } from "@root/lib/utils";
 
-// Компоненты shadcn/ui
-import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import {
   Tooltip,
@@ -56,31 +54,19 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 
-// Иконки
 import {
-  ClipboardPaste,
-  X,
   PlusCircle,
   RefreshCw,
   Zap,
   FileText,
   Loader2,
-  Menu,
 } from "lucide-react";
+import { SidebarTrigger } from "@/components/ui/sidebar";
 
 const ProfilePage = () => {
   const { t } = useTranslation();
   const location = useLocation();
-  const navigate = useNavigate();
   const { addListener } = useListen();
   const [url, setUrl] = useState("");
   const [disabled, setDisabled] = useState(false);
@@ -89,7 +75,6 @@ const ProfilePage = () => {
   const [updateAllLoading, setUpdateAllLoading] = useState(false);
   const [enhanceLoading, setEnhanceLoading] = useState(false);
 
-  // Логика для "липкой" шапки
   const scrollerRef = useRef<HTMLDivElement>(null);
   const [isScrolled, setIsScrolled] = useState(false);
 
@@ -335,15 +320,6 @@ const ProfilePage = () => {
     };
   }, [mutateProfiles]);
 
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Settings"), path: "/settings" },
-    { label: t("Logs"), path: "/logs" },
-    { label: t("Proxies"), path: "/proxies" },
-    { label: t("Connections"), path: "/connections" },
-    { label: t("Rules"), path: "/rules" },
-  ];
-
   return (
     <div className="h-full w-full relative">
       <div
@@ -353,6 +329,9 @@ const ProfilePage = () => {
         )}
       >
         <div className="flex justify-between items-center">
+          <div className="w-10">
+            <SidebarTrigger />
+          </div>
           <h2 className="text-2xl font-semibold tracking-tight">
             {t("Profiles")}
           </h2>
@@ -424,74 +403,14 @@ const ProfilePage = () => {
                   <p>{t("View Runtime Config")}</p>
                 </TooltipContent>
               </Tooltip>
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="ghost" size="icon" title={t("Menu")}>
-                    <Menu className="h-5 w-5" />
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="end">
-                  <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-                  <DropdownMenuSeparator />
-                  {menuItems.map((item) => (
-                    <DropdownMenuItem
-                      key={item.path}
-                      onSelect={() => navigate(item.path)}
-                      disabled={location.pathname === item.path}
-                    >
-                      {item.label}
-                    </DropdownMenuItem>
-                  ))}
-                </DropdownMenuContent>
-              </DropdownMenu>
             </div>
           </TooltipProvider>
         </div>
-        <div className="flex flex-wrap items-center gap-2">
-          <div className="flex items-center gap-1 flex-grow sm:flex-grow-0">
-            <Input
-              type="text"
-              placeholder={t("Profile URL")}
-              value={url}
-              onChange={(e) => setUrl(e.target.value)}
-              className="h-9 min-w-[200px] flex-grow sm:w-80"
-            />
-            {url ? (
-              <Button
-                variant="ghost"
-                size="icon"
-                title={t("Clear")}
-                onClick={() => setUrl("")}
-                className="h-9 w-9 flex-shrink-0"
-              >
-                <X className="h-4 w-4" />
-              </Button>
-            ) : (
-              <Button
-                variant="ghost"
-                size="icon"
-                title={t("Paste")}
-                onClick={onCopyLink}
-                className="h-9 w-9 flex-shrink-0"
-              >
-                <ClipboardPaste className="h-4 w-4" />
-              </Button>
-            )}
-          </div>
-          <Button
-            onClick={onImport}
-            disabled={!url || disabled || importLoading}
-            className="h-9"
-          >
-            {importLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-            {t("Import")}
-          </Button>
-        </div>
       </div>
 
       <div
         ref={scrollerRef}
-        className="absolute top-0 left-0 right-0 bottom-0 pt-40 overflow-y-auto"
+        className="absolute top-0 left-0 right-0 bottom-0 pt-25 overflow-y-auto"
       >
         <DndContext
           sensors={sensors}

src/pages/proxies.tsx

@@ -1,27 +1,17 @@
 import useSWR from "swr";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { useLockFn } from "ahooks";
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
 import { Button } from "@/components/ui/button";
 import { closeAllConnections, getClashConfig } from "@/services/api";
 import { patchClashMode } from "@/services/cmds";
 import { useVerge } from "@/hooks/use-verge";
 import { ProxyGroups } from "@/components/proxy/proxy-groups";
 import { ProviderButton } from "@/components/proxy/provider-button";
-import {
+import { SidebarTrigger } from "@/components/ui/sidebar";
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { Menu } from "lucide-react";
 
 const ProxyPage = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
 
   const { data: clashConfig, mutate: mutateClash } = useSWR(
     "getClashConfig",
@@ -50,18 +40,12 @@ const ProxyPage = () => {
     }
   }, [curMode]);
 
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Profiles"), path: "/profile" },
-    { label: t("Settings"), path: "/settings" },
-    { label: t("Logs"), path: "/logs" },
-    { label: t("Connections"), path: "/connections" },
-    { label: t("Rules"), path: "/rules" },
-  ];
-
   return (
     <div className="h-full flex flex-col">
       <div className="p-4 pb-2 flex justify-between items-center">
+        <div className="w-10">
+          <SidebarTrigger />
+        </div>
         <h2 className="text-2xl font-semibold tracking-tight">
           {t("Proxies")}
         </h2>
@@ -80,26 +64,6 @@ const ProxyPage = () => {
               </Button>
             ))}
           </div>
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button variant="ghost" size="icon" title={t("Menu")}>
-                <Menu className="h-5 w-5" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-              <DropdownMenuSeparator />
-              {menuItems.map((item) => (
-                <DropdownMenuItem
-                  key={item.path}
-                  onSelect={() => navigate(item.path)}
-                  disabled={location.pathname === item.path}
-                >
-                  {item.label}
-                </DropdownMenuItem>
-              ))}
-            </DropdownMenuContent>
-          </DropdownMenu>
         </div>
       </div>
 

src/pages/rules.tsx

@@ -1,33 +1,20 @@
-import { useState, useMemo, useRef, useEffect, useCallback } from "react";
+import React, { useState, useMemo, useRef, useEffect, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
 import { Virtuoso, VirtuosoHandle } from "react-virtuoso";
 import { useAppData } from "@/providers/app-data-provider";
 import { useVisibility } from "@/hooks/use-visibility";
 import { cn } from "@root/lib/utils";
 
-// Компоненты
 import { BaseEmpty } from "@/components/base";
 import RuleItem from "@/components/rule/rule-item";
 import { ProviderButton } from "@/components/rule/provider-button";
-import { BaseSearchBox, SearchState } from "@/components/base/base-search-box";
+import { BaseSearchBox } from "@/components/base/base-search-box";
 import { ScrollTopButton } from "@/components/layout/scroll-top-button";
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 
-// Иконки
+import { SidebarTrigger } from "@/components/ui/sidebar";
-import { Menu } from "lucide-react";
 
 const RulesPage = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
   const { rules = [], refreshRules, refreshRuleProviders } = useAppData();
   const [match, setMatch] = useState(() => (_: string) => true);
   const virtuosoRef = useRef<VirtuosoHandle>(null);
@@ -36,24 +23,17 @@ const RulesPage = () => {
   const [isScrolled, setIsScrolled] = useState(false);
   const pageVisible = useVisibility();
 
-  // --- НАЧАЛО ИЗМЕНЕНИЙ 1 ---
-  // Разделяем логику на два безопасных useEffect
   useEffect(() => {
-    // Этот эффект сработает только один раз при монтировании компонента
     refreshRules();
     refreshRuleProviders();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
-  }, []); // Пустой массив зависимостей = запуск только один раз
 
   useEffect(() => {
-    // Этот эффект будет срабатывать только при изменении видимости страницы
     if (pageVisible) {
       refreshRules();
       refreshRuleProviders();
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pageVisible]);
-  // --- КОНЕЦ ИЗМЕНЕНИЙ 1 ---
 
   const filteredRules = useMemo(() => {
     return rules.filter((item) => match(item.payload));
@@ -75,21 +55,9 @@ const RulesPage = () => {
     virtuosoRef.current?.scrollTo({ top: 0, behavior: "smooth" });
   }, []);
 
-  // --- НАЧАЛО ИЗМЕНЕНИЙ 2 ---
-  // Оборачиваем обработчик поиска в useCallback для стабильности
   const handleSearch = useCallback((matcher: (content: string) => boolean) => {
     setMatch(() => matcher);
   }, []);
-  // --- КОНЕЦ ИЗМЕНЕНИЙ 2 ---
-
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Profiles"), path: "/profile" },
-    { label: t("Settings"), path: "/settings" },
-    { label: t("Logs"), path: "/logs" },
-    { label: t("Proxies"), path: "/proxies" },
-    { label: t("Connections"), path: "/connections" },
-  ];
 
   return (
     <div className="h-full w-full relative">
@@ -100,35 +68,17 @@ const RulesPage = () => {
         )}
       >
         <div className="flex justify-between items-center">
+          <div className="w-10">
+            <SidebarTrigger />
+          </div>
           <h2 className="text-2xl font-semibold tracking-tight">
             {t("Rules")}
           </h2>
           <div className="flex items-center gap-2">
             <div className="w-70">
-              {/* Передаем стабильную функцию handleSearch в пропс */}
               <BaseSearchBox onSearch={handleSearch} />
             </div>
             <ProviderButton />
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button variant="ghost" size="icon" title={t("Menu")}>
-                  <Menu className="h-5 w-5" />
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="end">
-                <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                {menuItems.map((item) => (
-                  <DropdownMenuItem
-                    key={item.path}
-                    onSelect={() => navigate(item.path)}
-                    disabled={location.pathname === item.path}
-                  >
-                    {item.label}
-                  </DropdownMenuItem>
-                ))}
-              </DropdownMenuContent>
-            </DropdownMenu>
           </div>
         </div>
       </div>
@@ -150,7 +100,6 @@ const RulesPage = () => {
           <BaseEmpty />
         )}
       </div>
-
       <ScrollTopButton onClick={scrollToTop} show={showScrollTop} />
     </div>
   );

src/pages/settings.tsx

@@ -7,23 +7,14 @@ import SettingVergeAdvanced from "@/components/setting/setting-verge-advanced";
 import SettingClash from "@/components/setting/setting-clash";
 import SettingSystem from "@/components/setting/setting-system";
 import { showNotice } from "@/services/noticeService";
-import { useNavigate } from "react-router-dom";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { Menu, Github, HelpCircle, Send } from "lucide-react";
 import { cn } from "@root/lib/utils";
+import { SidebarTrigger } from "@/components/ui/sidebar";
 
 const SettingPage = () => {
   const { t } = useTranslation();
-  const navigate = useNavigate();
 
   const scrollContainerRef = useRef<HTMLDivElement>(null);
   const [isScrolled, setIsScrolled] = useState(false);
@@ -46,14 +37,6 @@ const SettingPage = () => {
   const toGithubRepo = useLockFn(() =>
     openWebUrl("https://github.com/coolcoala/clash-verge-rev-lite"),
   );
-  const menuItems = [
-    { label: t("Home"), path: "/home" },
-    { label: t("Profiles"), path: "/profile" },
-    { label: t("Logs"), path: "/logs" },
-    { label: t("Proxies"), path: "/proxies" },
-    { label: t("Connections"), path: "/connections" },
-    { label: t("Rules"), path: "/rules" },
-  ];
 
   return (
     <div className="h-full w-full relative">
@@ -63,9 +46,13 @@ const SettingPage = () => {
           { "bg-background/80 backdrop-blur-sm": isScrolled },
         )}
       >
+        <div className="w-10">
+          <SidebarTrigger />
+        </div>
         <h2 className="text-2xl font-semibold tracking-tight">
           {t("Settings")}
         </h2>
+
         <div className="flex items-center gap-2">
           <Button
             variant="ghost"
@@ -75,26 +62,6 @@ const SettingPage = () => {
           >
             <Github className="h-5 w-5" />
           </Button>
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button variant="ghost" size="icon" title={t("Menu")}>
-                <Menu className="h-5 w-5" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuLabel>{t("Menu")}</DropdownMenuLabel>
-              <DropdownMenuSeparator />
-              {menuItems.map((item) => (
-                <DropdownMenuItem
-                  key={item.path}
-                  onSelect={() => navigate(item.path)}
-                  disabled={location.pathname === item.path}
-                >
-                  {item.label}
-                </DropdownMenuItem>
-              ))}
-            </DropdownMenuContent>
-          </DropdownMenu>
         </div>
       </div>