Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
feat: show system proxy info
Browse files Browse the repository at this point in the history
  • Loading branch information
zzzgydi committed Jan 11, 2022
1 parent df5953d commit 7fc9631
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/components/setting-verge.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import useSWR, { useSWRConfig } from "swr";
import {
Box,
List,
ListItemText,
ListSubheader,
Expand All @@ -12,6 +13,7 @@ import { version } from "../../package.json";
import GuardState from "./guard-state";
import SettingItem from "./setting-item";
import PaletteSwitch from "./palette-switch";
import SysproxyTooltip from "./sysproxy-tooltip";

interface Props {
onError?: (err: Error) => void;
Expand Down Expand Up @@ -84,7 +86,14 @@ const SettingVerge = ({ onError }: Props) => {
</SettingItem>

<SettingItem>
<ListItemText primary="System Proxy" />
<ListItemText
primary={
<Box sx={{ display: "flex", alignItems: "center" }}>
System Proxy
<SysproxyTooltip />
</Box>
}
/>
<GuardState
value={proxy}
valueProps="checked"
Expand Down
53 changes: 53 additions & 0 deletions src/components/sysproxy-tooltip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { useEffect, useState } from "react";
import { InfoRounded } from "@mui/icons-material";
import { ClickAwayListener, Tooltip } from "@mui/material";
import { getSystemProxy } from "../services/cmds";

const SysproxyTooltip = () => {
const [open, setOpen] = useState(false);
const [info, setInfo] = useState<any>({});

const onShow = async () => {
const data = await getSystemProxy();
console.log(data);
setInfo(data ?? {});
setOpen(true);
};

useEffect(() => {
if (!open) return;
const timer = setTimeout(() => setOpen(false), 2000);
return () => clearTimeout(timer);
}, [open]);

// todo: add error info
const showTitle = (
<div>
<div>Enable: {(!!info.enable).toString()}</div>
<div>Server: {info.server}</div>
<div>Bypass: {info.bypass}</div>
</div>
);

return (
<ClickAwayListener onClickAway={() => setOpen(false)}>
<Tooltip
PopperProps={{
disablePortal: true,
}}
onClose={() => setOpen(false)}
open={open}
disableFocusListener
disableHoverListener
disableTouchListener
placement="top"
title={showTitle}
arrow
>
<InfoRounded fontSize="small" onClick={onShow} />
</Tooltip>
</ClickAwayListener>
);
};

export default SysproxyTooltip;
4 changes: 4 additions & 0 deletions src/services/cmds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@ export async function getVergeConfig() {
export async function patchVergeConfig(payload: CmdType.VergeConfig) {
return invoke<void>("patch_verge_config", { payload });
}

export async function getSystemProxy() {
return invoke<any>("get_sys_proxy");
}

0 comments on commit 7fc9631

Please sign in to comment.