diff options
| author | Haishan <[email protected]> | 2018-12-23 15:20:17 +0800 |
|---|---|---|
| committer | Haishan <[email protected]> | 2018-12-23 15:20:17 +0800 |
| commit | 852c91b44f9d0f318e2a8e5cbb6ae6ba7ece546a (patch) | |
| tree | 2add61c72a400794497a1880ad48fdd887d6ff85 /src/components | |
| parent | a05a34e140bcda098187bd55cfffcf7ede2f6d1d (diff) | |
fix: remove built-in proxy type filtering
closes #4
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/Proxies.js | 4 | ||||
| -rw-r--r-- | src/components/Proxy.js | 6 | ||||
| -rw-r--r-- | src/components/ProxyGroup.js | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/components/Proxies.js b/src/components/Proxies.js index b677dbb..e9b5cbd 100644 --- a/src/components/Proxies.js +++ b/src/components/Proxies.js @@ -8,14 +8,14 @@ import Button from 'c/Button'; import s0 from 'c/Proxies.module.scss'; import { - getUserProxies, + getProxies, getProxyGroupNames, fetchProxies, requestDelayAll } from 'd/proxies'; const mapStateToProps = s => ({ - proxies: getUserProxies(s), + proxies: getProxies(s), groupNames: getProxyGroupNames(s) }); diff --git a/src/components/Proxy.js b/src/components/Proxy.js index 3e248cd..7f2e4bf 100644 --- a/src/components/Proxy.js +++ b/src/components/Proxy.js @@ -13,7 +13,7 @@ import fallback from 's/fallback.svg'; import s0 from './Proxy.module.scss'; -import { getDelay, getUserProxies } from 'd/proxies'; +import { getDelay, getProxies } from 'd/proxies'; const colors = { Vmess: '#ca3487', @@ -31,11 +31,9 @@ const icons = { Fallback: fallback.id }; -// typeof Proxy = 'Shadowsocks' | 'Vmess' | 'Socks5'; - const mapStateToProps = s => { return { - proxies: getUserProxies(s), + proxies: getProxies(s), delay: getDelay(s) }; }; diff --git a/src/components/ProxyGroup.js b/src/components/ProxyGroup.js index 91b9717..e54a23a 100644 --- a/src/components/ProxyGroup.js +++ b/src/components/ProxyGroup.js @@ -6,10 +6,10 @@ import Proxy from 'c/Proxy'; import s0 from './ProxyGroup.module.scss'; -import { getUserProxies, switchProxy } from 'd/proxies'; +import { getProxies, switchProxy } from 'd/proxies'; const mapStateToProps = s => ({ - proxies: getUserProxies(s) + proxies: getProxies(s) }); // should move this to sth like constants.js |
