diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index ccb29cc..ac38428 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -118,18 +118,19 @@ const App: React.FC = () => { } const navigateMap = { - sysproxy: "sysproxy", - tun: "tun", - profile: "profiles", - proxy: "proxies", - mihomo: "mihomo", - connection: "connections", - dns: "dns", - sniff: "sniffer", - log: "logs", - rule: "rules", - resource: "resources", - override: "override" + sysproxy: 'sysproxy', + tun: 'tun', + profile: 'profiles', + proxy: 'proxies', + mihomo: 'mihomo', + connection: 'connections', + dns: 'dns', + sniff: 'sniffer', + log: 'logs', + rule: 'rules', + resource: 'resources', + override: 'override', + substore: 'substore' } const componentMap = { diff --git a/src/renderer/src/components/sider/conn-card.tsx b/src/renderer/src/components/sider/conn-card.tsx index 10b532a..6952a2b 100644 --- a/src/renderer/src/components/sider/conn-card.tsx +++ b/src/renderer/src/components/sider/conn-card.tsx @@ -177,7 +177,9 @@ const ConnCard: React.FC = () => { <> @@ -224,7 +226,9 @@ const ConnCard: React.FC = () => { ) : ( diff --git a/src/renderer/src/components/sider/dns-card.tsx b/src/renderer/src/components/sider/dns-card.tsx index fc9109d..e16cb30 100644 --- a/src/renderer/src/components/sider/dns-card.tsx +++ b/src/renderer/src/components/sider/dns-card.tsx @@ -43,7 +43,9 @@ const DNSCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/log-card.tsx b/src/renderer/src/components/sider/log-card.tsx index 6085400..28a7560 100644 --- a/src/renderer/src/components/sider/log-card.tsx +++ b/src/renderer/src/components/sider/log-card.tsx @@ -32,7 +32,9 @@ const LogCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/mihomo-core-card.tsx b/src/renderer/src/components/sider/mihomo-core-card.tsx index f4a8798..3d0f143 100644 --- a/src/renderer/src/components/sider/mihomo-core-card.tsx +++ b/src/renderer/src/components/sider/mihomo-core-card.tsx @@ -56,7 +56,9 @@ const MihomoCoreCard: React.FC = () => { {mihomoCoreCardStatus === 'col-span-2' ? ( @@ -105,7 +107,9 @@ const MihomoCoreCard: React.FC = () => { ) : ( diff --git a/src/renderer/src/components/sider/override-card.tsx b/src/renderer/src/components/sider/override-card.tsx index 3bc6e4c..d1ad641 100644 --- a/src/renderer/src/components/sider/override-card.tsx +++ b/src/renderer/src/components/sider/override-card.tsx @@ -34,7 +34,9 @@ const OverrideCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/profile-card.tsx b/src/renderer/src/components/sider/profile-card.tsx index 06cac54..025debe 100644 --- a/src/renderer/src/components/sider/profile-card.tsx +++ b/src/renderer/src/components/sider/profile-card.tsx @@ -61,7 +61,9 @@ const ProfileCard: React.FC = () => { {profileCardStatus === 'col-span-2' ? ( @@ -150,7 +152,9 @@ const ProfileCard: React.FC = () => { ) : ( diff --git a/src/renderer/src/components/sider/proxy-card.tsx b/src/renderer/src/components/sider/proxy-card.tsx index 8ba747b..3abd036 100644 --- a/src/renderer/src/components/sider/proxy-card.tsx +++ b/src/renderer/src/components/sider/proxy-card.tsx @@ -36,7 +36,9 @@ const ProxyCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/resource-card.tsx b/src/renderer/src/components/sider/resource-card.tsx index 2f532da..bd7a0c8 100644 --- a/src/renderer/src/components/sider/resource-card.tsx +++ b/src/renderer/src/components/sider/resource-card.tsx @@ -33,7 +33,9 @@ const ResourceCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/rule-card.tsx b/src/renderer/src/components/sider/rule-card.tsx index f45b096..5e17a23 100644 --- a/src/renderer/src/components/sider/rule-card.tsx +++ b/src/renderer/src/components/sider/rule-card.tsx @@ -35,7 +35,9 @@ const RuleCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/sniff-card.tsx b/src/renderer/src/components/sider/sniff-card.tsx index 430cf46..51e4cda 100644 --- a/src/renderer/src/components/sider/sniff-card.tsx +++ b/src/renderer/src/components/sider/sniff-card.tsx @@ -44,7 +44,9 @@ const SniffCard: React.FC = () => { > diff --git a/src/renderer/src/components/sider/substore-card.tsx b/src/renderer/src/components/sider/substore-card.tsx index fbfa65d..45ba309 100644 --- a/src/renderer/src/components/sider/substore-card.tsx +++ b/src/renderer/src/components/sider/substore-card.tsx @@ -1,5 +1,5 @@ import { Button, Card, CardBody, CardFooter } from '@nextui-org/react' -import { useLocation, useNavigate } from 'react-router-dom' +import { useLocation } from 'react-router-dom' import { useSortable } from '@dnd-kit/sortable' import { CSS } from '@dnd-kit/utilities' import SubStoreIcon from '../base/substore-icon' @@ -7,7 +7,6 @@ import { useAppConfig } from '@renderer/hooks/use-app-config' const SubStoreCard: React.FC = () => { const { appConfig } = useAppConfig() const { substoreCardStatus = 'col-span-1', useSubStore = true } = appConfig || {} - const navigate = useNavigate() const location = useLocation() const match = location.pathname.includes('/substore') const { @@ -32,13 +31,14 @@ const SubStoreCard: React.FC = () => { className={`${substoreCardStatus} ${!useSubStore ? 'hidden' : ''}`} > navigate('/substore')} + className={`${match ? 'bg-primary' : 'hover:bg-primary/30'} ${isDragging ? 'scale-[0.97] tap-highlight-transparent' : ''}`} > -
+