From bea19a263db88fef44b4356082b199fbfcc39a25 Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Sun, 6 Apr 2025 16:40:33 +0700
Subject: Code refactoring (#2865)

* refactor: use vue inline styles in entire application

* refactor: setting row in dashboard page

* refactor: use blob for download file in text modal

* refactor: move all html templates in `web/html` folder

* refactor: `DeviceUtils` -> `MediaQueryMixin`
The transition to mixins has been made, as they can update themselves.

* chore: pretty right buttons in `outbounds` tab in xray settings

* refactor: add translations for system status

* refactor: adjust gutter spacing in setting list item

* refactor: use native `a-input-password` for password field

* chore: return old system status
with new translations

* chore: add missing translation
---
 .../xui/settings/panel/subscription/general.html   |  98 -----------
 web/html/xui/settings/panel/subscription/json.html | 180 ---------------------
 2 files changed, 278 deletions(-)
 delete mode 100644 web/html/xui/settings/panel/subscription/general.html
 delete mode 100644 web/html/xui/settings/panel/subscription/json.html

(limited to 'web/html/xui/settings/panel/subscription')

diff --git a/web/html/xui/settings/panel/subscription/general.html b/web/html/xui/settings/panel/subscription/general.html
deleted file mode 100644
index c5577c88..00000000
--- a/web/html/xui/settings/panel/subscription/general.html
+++ /dev/null
@@ -1,98 +0,0 @@
-{{define "settings/panel/subscription/general"}}
-<a-collapse default-active-key="1">
-    <a-collapse-panel key="1" header='{{ i18n "pages.xray.generalConfigs"}}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subEnable"}}</template>
-            <template #description>{{ i18n "pages.settings.subEnableDesc"}}</template>
-            <template #control>
-                <a-switch v-model="allSetting.subEnable"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subTitle"}}</template>
-            <template #description>{{ i18n "pages.settings.subTitleDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subTitle"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subListen"}}</template>
-            <template #description>{{ i18n "pages.settings.subListenDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subListen"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subDomain"}}</template>
-            <template #description>{{ i18n "pages.settings.subDomainDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subDomain"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subPort"}}</template>
-            <template #description>{{ i18n "pages.settings.subPortDesc"}}</template>
-            <template #control>
-                <a-input-number v-model="allSetting.subPort" :min="1" :min="65531"
-                    style="width: 100%;"></a-input-number>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subPath"}}</template>
-            <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subPath"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subURI"}}</template>
-            <template #description>{{ i18n "pages.settings.subURIDesc"}}</template>
-            <template #control>
-                <a-input type="text" placeholder="(http|https)://domain[:port]/path/"
-                    v-model="allSetting.subURI"></a-input>
-            </template>
-        </a-setting-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="2" header='{{ i18n "pages.settings.information" }}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subEncrypt"}}</template>
-            <template #description>{{ i18n "pages.settings.subEncryptDesc"}}</template>
-            <template #control>
-                <a-switch v-model="allSetting.subEncrypt"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subShowInfo"}}</template>
-            <template #description>{{ i18n "pages.settings.subShowInfoDesc"}}</template>
-            <template #control>
-                <a-switch v-model="allSetting.subShowInfo"></a-switch>
-            </template>
-        </a-setting-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="3" header='{{ i18n "pages.settings.certs" }}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subCertPath"}}</template>
-            <template #description>{{ i18n "pages.settings.subCertPathDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subCertFile"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subKeyPath"}}</template>
-            <template #description>{{ i18n "pages.settings.subKeyPathDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subKeyFile"></a-input>
-            </template>
-        </a-setting-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="4" header='{{ i18n "pages.settings.intervals"}}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subUpdates"}}</template>
-            <template #description>{{ i18n "pages.settings.subUpdatesDesc"}}</template>
-            <template #control>
-                <a-input-number :min="1" v-model="allSetting.subUpdates" style="width: 100%;"></a-input-number>
-            </template>
-        </a-setting-list-item>
-    </a-collapse-panel>
-</a-collapse>
-{{end}}
\ No newline at end of file
diff --git a/web/html/xui/settings/panel/subscription/json.html b/web/html/xui/settings/panel/subscription/json.html
deleted file mode 100644
index 4f0ee302..00000000
--- a/web/html/xui/settings/panel/subscription/json.html
+++ /dev/null
@@ -1,180 +0,0 @@
-{{define "settings/panel/subscription/json"}}
-<a-collapse default-active-key="1">
-    <a-collapse-panel key="1" header='{{ i18n "pages.xray.generalConfigs"}}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subPath"}}</template>
-            <template #description>{{ i18n "pages.settings.subPathDesc"}}</template>
-            <template #control>
-                <a-input type="text" v-model="allSetting.subJsonPath"></a-input>
-            </template>
-        </a-setting-list-item>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.subURI"}}</template>
-            <template #description>{{ i18n "pages.settings.subURIDesc"}}</template>
-            <template #control>
-                <a-input type="text" placeholder="(http|https)://domain[:port]/path/"
-                    v-model="allSetting.subJsonURI"></a-input>
-            </template>
-        </a-setting-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="2" header='{{ i18n "pages.settings.fragment"}}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.fragment"}}</template>
-            <template #description>{{ i18n "pages.settings.fragmentDesc"}}</template>
-            <template #control>
-                <a-switch v-model="fragment"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-list-item v-if="fragment" style="padding: 10px 20px;">
-            <a-collapse>
-                <a-collapse-panel header='{{ i18n "pages.settings.fragmentSett"}}' v-if="fragment">
-                    <a-setting-list-item paddings="small">
-                        <template #title>Packets</template>
-                        <template #control>
-                            <a-input type="text" v-model="fragmentPackets"
-                                placeholder="1-1 | 1-3 | tlshello | ..."></a-input>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>Length</template>
-                        <template #control>
-                            <a-input type="text" v-model="fragmentLength" placeholder="100-200"></a-input>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>Interval</template>
-                        <template #control>
-                            <a-input type="text" v-model="fragmentInterval" placeholder="10-20"></a-input>
-                        </template>
-                    </a-setting-list-item>
-                </a-collapse-panel>
-            </a-collapse>
-        </a-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="3" header="Noises">
-        <a-setting-list-item paddings="small">
-            <template #title>Noises</template>
-            <template #description>{{ i18n "pages.settings.noisesDesc"}}</template>
-            <template #control>
-                <a-switch v-model="noises"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-list-item v-if="noises" style="padding: 10px 20px;">
-            <a-collapse>
-                <a-collapse-panel v-for="(noise, index) in noisesArray" :key="index" :header="`Noise №${index + 1}`">
-                    <a-setting-list-item paddings="small">
-                        <template #title>Type</template>
-                        <template #control>
-                            <a-select :value="noise.type" style="width: 100%"
-                                :dropdown-class-name="themeSwitcher.currentTheme"
-                                @change="(value) => updateNoiseType(index, value)">
-                                <a-select-option :value="p" :label="p" v-for="p in ['rand', 'base64', 'str', 'hex']" :key="p">
-                                    <span>[[ p ]]</span>
-                                </a-select-option>
-                            </a-select>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>Packet</template>
-                        <template #control>
-                            <a-input type="text" :value="noise.packet"
-                                @input="(value) => updateNoisePacket(index, event.target.value)"
-                                placeholder="5-10"></a-input>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>Delay (ms)</template>
-                        <template #control>
-                            <a-input type="text" :value="noise.delay"
-                                @input="(value) => updateNoiseDelay(index, event.target.value)"
-                                placeholder="10-20"></a-input>
-                        </template>
-                    </a-setting-list-item>
-                    <a-space direction="horizontal" style="padding: 10px 20px;">
-                        <a-button v-if="noisesArray.length > 1" type="danger"
-                            @click="removeNoise(index)">Remove</a-button>
-                    </a-space>
-                </a-collapse-panel>
-            </a-collapse>
-            <a-button v-if="noises" type="primary" @click="addNoise" style="margin-top: 10px">Add Noise</a-button>
-        </a-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="4" header='{{ i18n "pages.settings.mux"}}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.mux"}}</template>
-            <template #description>{{ i18n "pages.settings.muxDesc"}}</template>
-            <template #control>
-                <a-switch v-model="enableMux"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-list-item v-if="enableMux" style="padding: 10px 20px;">
-            <a-collapse>
-                <a-collapse-panel header='{{ i18n "pages.settings.muxSett"}}'>
-                    <a-setting-list-item paddings="small">
-                        <template #title>Concurrency</template>
-                        <template #control>
-                            <a-input-number v-model="muxConcurrency" :min="-1" :max="1024"
-                                style="width: 100%;"></a-input-number>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>xudp Concurrency</template>
-                        <template #control>
-                            <a-input-number v-model="muxXudpConcurrency" :min="-1" :max="1024"
-                                style="width: 100%;"></a-input-number>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>xudp UDP 443</template>
-                        <template #control>
-                            <a-select v-model="muxXudpProxyUDP443" style="width: 100%"
-                                :dropdown-class-name="themeSwitcher.currentTheme">
-                                <a-select-option :value="p" :label="p" v-for="p in ['reject', 'allow', 'skip']">
-                                    <span>[[ p ]]</span>
-                                </a-select-option>
-                            </a-select>
-                        </template>
-                    </a-setting-list-item>
-                </a-collapse-panel>
-            </a-collapse>
-        </a-list-item>
-    </a-collapse-panel>
-    <a-collapse-panel key="5" header='{{ i18n "pages.settings.direct" }}'>
-        <a-setting-list-item paddings="small">
-            <template #title>{{ i18n "pages.settings.direct"}}</template>
-            <template #description>{{ i18n "pages.settings.directDesc"}}</template>
-            <template #control>
-                <a-switch v-model="enableDirect"></a-switch>
-            </template>
-        </a-setting-list-item>
-        <a-list-item v-if="enableDirect" style="padding: 10px 20px;">
-            <a-collapse>
-                <a-collapse-panel header='{{ i18n "pages.settings.direct"}}'>
-                    <a-setting-list-item paddings="small">
-                        <template #title>{{ i18n "pages.xray.directips" }}</template>
-                        <template #control>
-                            <a-select mode="tags" style="width: 100%" v-model="directIPs"
-                                :dropdown-class-name="themeSwitcher.currentTheme">
-                                <a-select-option :value="p.value" :label="p.label" v-for="p in directIPsOptions">
-                                    <span>[[ p.label ]]</span>
-                                </a-select-option>
-                            </a-select>
-                        </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                        <template #title>{{ i18n "pages.xray.directdomains" }}</template>
-                        <template #control>
-                            <a-select mode="tags" style="width: 100%" v-model="directDomains"
-                                :dropdown-class-name="themeSwitcher.currentTheme">
-                                <a-select-option :value="p.value" :label="p.label" v-for="p in diretDomainsOptions">
-                                    <span>[[ p.label ]]</span>
-                                </a-select-option>
-                            </a-select>
-                        </template>
-                    </a-setting-list-item>
-                </a-collapse-panel>
-            </a-collapse>
-        </a-list-item>
-    </a-collapse-panel>
-</a-collapse>
-{{end}}
\ No newline at end of file
-- 
cgit v1.2.3