Skip to content

Commit

Permalink
feat: 支持 Egern, JSON, URI
Browse files Browse the repository at this point in the history
  • Loading branch information
xream committed Nov 21, 2024
1 parent 53854f7 commit fdc016d
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sub-store-front-end",
"version": "2.14.298",
"version": "2.14.299",
"private": true,
"scripts": {
"dev": "vite --host",
Expand Down
Binary file added src/assets/icons/egern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/egern_color.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/assets/icons/json.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/icons/uri.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/ArtifactPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
<nut-radio label="Stash">Stash</nut-radio>
<nut-radio label="ClashMeta">Clash.Meta(mihomo)</nut-radio>
<nut-radio label="Clash">Clash(Deprecated)</nut-radio>
<nut-radio label="Egern">Egern</nut-radio>
<nut-radio label="Surfboard">Surfboard</nut-radio>
<nut-radio label="SurgeMac"><a href="https://github.com/sub-store-org/Sub-Store/wiki/%E9%93%BE%E6%8E%A5%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E" target="_blank">Surge(macOS) ⓘ</a></nut-radio>
<nut-radio label="Surge">Surge</nut-radio>
Expand Down
4 changes: 4 additions & 0 deletions src/components/ArtifactsListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ import logoIcon from "@/assets/icons/logo.png";
import logoRedIcon from "@/assets/icons/logo-red.png";
import singboxIcon from "@/assets/icons/sing-box.png";
import clashIcon from "@/assets/icons/clash.png";
import egernIcon from "@/assets/icons/egern.png";
import clashMetaIcon from "@/assets/icons/clashmeta.png";
import loonIcon from "@/assets/icons/loon.png";
import quanxIcon from "@/assets/icons/quanx.png";
Expand All @@ -172,6 +173,7 @@ import surgeMacIcon from "@/assets/icons/surgeformac_text.png";
import v2rayIcon from "@/assets/icons/v2ray.png";
import singboxColorIcon from "@/assets/icons/sing-box_color.png";
import clashColorIcon from "@/assets/icons/clash_color.png";
import egernColorIcon from "@/assets/icons/egern_color.png";
import clashMetaColorIcon from "@/assets/icons/clashmeta_color.png";
import loonColorIcon from "@/assets/icons/loon_color.png";
import quanxColorIcon from "@/assets/icons/quanx_color.png";
Expand Down Expand Up @@ -270,6 +272,8 @@ const icon = computed(() => {
return appearanceSetting.value.isIconColor ? quanxColorIcon : quanxIcon;
case "Loon":
return appearanceSetting.value.isIconColor ? loonColorIcon : loonIcon;
case "Egern":
return appearanceSetting.value.isIconColor ? egernColorIcon : egernIcon;
case "Clash":
return appearanceSetting.value.isIconColor ? clashColorIcon : clashIcon;
case "ClashMeta":
Expand Down
20 changes: 19 additions & 1 deletion src/components/PreviewPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,13 @@

<script lang="ts" setup>
import { Toast, Dialog } from '@nutui/nutui';
import json from '@/assets/icons/json.svg';
import uri from '@/assets/icons/uri.svg';
import surfboard from '@/assets/icons/surfboard.png';
import surge from '@/assets/icons/surge.png';
import surgeMac from '@/assets/icons/surgeformac_text.png';
import clash from '@/assets/icons/clash.png';
import egern from '@/assets/icons/egern.png';
import quanx from '@/assets/icons/quanx.png';
import loon from '@/assets/icons/loon.png';
import stash from '@/assets/icons/stash.png';
Expand Down Expand Up @@ -110,6 +113,11 @@
path: 'Clash',
icon: clash,
},
{
name: 'Egern',
path: 'Egern',
icon: egern,
},
{
name: 'Surfboard',
path: 'Surfboard',
Expand Down Expand Up @@ -151,6 +159,16 @@
path: 'V2Ray',
icon: v2ray,
},
{
name: 'URI',
path: 'URI',
icon: uri,
},
{
name: 'JSON',
path: 'JSON',
icon: json,
},
];
const tips = () => {
window.open('https://github.com/sub-store-org/Sub-Store/wiki/%E9%93%BE%E6%8E%A5%E5%8F%82%E6%95%B0%E8%AF%B4%E6%98%8E');
Expand Down Expand Up @@ -201,7 +219,7 @@
.infos {
flex: 1;
padding: 6px 0;
padding: 3px 0;
display: flex;
align-items: center;
gap: 4px;
Expand Down
1 change: 1 addition & 0 deletions src/types/store/artifacts.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type ArtifactsPlatform =
| 'Clash'
| 'Stash'
| 'ShadowRocket'
| 'Egern'
| 'ClashMeta'
| 'sing-box'
| 'V2Ray';
Expand Down
1 change: 1 addition & 0 deletions src/types/store/globalStore.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ interface ENV {
| 'Loon'
| 'Surge'
| 'ShadowRocket'
| 'Egern'
| 'Clash'
| 'ClashMeta'
| 'V2Ray'
Expand Down

0 comments on commit fdc016d

Please sign in to comment.