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
---
 web/html/xui/modals/client_bulk_modal.html   | 250 ------------
 web/html/xui/modals/client_modal.html        | 172 --------
 web/html/xui/modals/dns_modal.html           | 114 ------
 web/html/xui/modals/fakedns_modal.html       |  57 ---
 web/html/xui/modals/inbound_info_modal.html  | 572 ---------------------------
 web/html/xui/modals/inbound_modal.html       | 144 -------
 web/html/xui/modals/prompt_modal.html        |  71 ----
 web/html/xui/modals/qrcode_modal.html        | 161 --------
 web/html/xui/modals/text_modal.html          |  52 ---
 web/html/xui/modals/warp_modal.html          | 246 ------------
 web/html/xui/modals/xray_balancer_modal.html | 123 ------
 web/html/xui/modals/xray_outbound_modal.html | 127 ------
 web/html/xui/modals/xray_reverse_modal.html  | 138 -------
 web/html/xui/modals/xray_rule_modal.html     | 246 ------------
 14 files changed, 2473 deletions(-)
 delete mode 100644 web/html/xui/modals/client_bulk_modal.html
 delete mode 100644 web/html/xui/modals/client_modal.html
 delete mode 100644 web/html/xui/modals/dns_modal.html
 delete mode 100644 web/html/xui/modals/fakedns_modal.html
 delete mode 100644 web/html/xui/modals/inbound_info_modal.html
 delete mode 100644 web/html/xui/modals/inbound_modal.html
 delete mode 100644 web/html/xui/modals/prompt_modal.html
 delete mode 100644 web/html/xui/modals/qrcode_modal.html
 delete mode 100644 web/html/xui/modals/text_modal.html
 delete mode 100644 web/html/xui/modals/warp_modal.html
 delete mode 100644 web/html/xui/modals/xray_balancer_modal.html
 delete mode 100644 web/html/xui/modals/xray_outbound_modal.html
 delete mode 100644 web/html/xui/modals/xray_reverse_modal.html
 delete mode 100644 web/html/xui/modals/xray_rule_modal.html

(limited to 'web/html/xui/modals')

diff --git a/web/html/xui/modals/client_bulk_modal.html b/web/html/xui/modals/client_bulk_modal.html
deleted file mode 100644
index 88e8e645..00000000
--- a/web/html/xui/modals/client_bulk_modal.html
+++ /dev/null
@@ -1,250 +0,0 @@
-{{define "modals/clientsBulkModal"}}
-<a-modal id="client-bulk-modal" v-model="clientsBulkModal.visible" :title="clientsBulkModal.title"
-    @ok="clientsBulkModal.ok" :confirm-loading="clientsBulkModal.confirmLoading" :closable="true" :mask-closable="false"
-    :ok-text="clientsBulkModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        <a-form-item label='{{ i18n "pages.client.method" }}'>
-            <a-select v-model="clientsBulkModal.emailMethod" buttonStyle="solid"
-                :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option :value="0">Random</a-select-option>
-                <a-select-option :value="1">Random+Prefix</a-select-option>
-                <a-select-option :value="2">Random+Prefix+Num</a-select-option>
-                <a-select-option :value="3">Random+Prefix+Num+Postfix</a-select-option>
-                <a-select-option :value="4">Prefix+Num+Postfix</a-select-option>
-            </a-select>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.first" }}' v-if="clientsBulkModal.emailMethod>1">
-            <a-input-number v-model.number="clientsBulkModal.firstNum" :min="1"></a-input-number>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.last" }}' v-if="clientsBulkModal.emailMethod>1">
-            <a-input-number v-model.number="clientsBulkModal.lastNum" :min="clientsBulkModal.firstNum"></a-input-number>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.prefix" }}' v-if="clientsBulkModal.emailMethod>0">
-            <a-input v-model.trim="clientsBulkModal.emailPrefix"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.postfix" }}' v-if="clientsBulkModal.emailMethod>2">
-            <a-input v-model.trim="clientsBulkModal.emailPostfix"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.clientCount" }}' v-if="clientsBulkModal.emailMethod < 2">
-            <a-input-number v-model.number="clientsBulkModal.quantity" :min="1" :max="100"></a-input-number>
-        </a-form-item>
-        <a-form-item label='{{ i18n "security" }}' v-if="inbound.protocol === Protocols.VMESS">
-            <a-select v-model="clientsBulkModal.security" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option v-for="key in USERS_SECURITY" :value="key">[[ key ]]</a-select-option>
-            </a-select>
-        </a-form-item>
-        <a-form-item label='Flow' v-if="clientsBulkModal.inbound.canEnableTlsFlow()">
-            <a-select v-model="clientsBulkModal.flow" :dropdown-class-name="themeSwitcher.currentTheme">
-                <a-select-option value="" selected>{{ i18n "none" }}</a-select-option>
-                <a-select-option v-for="key in TLS_FLOW_CONTROL" :value="key">[[ key ]]</a-select-option>
-            </a-select>
-        </a-form-item>
-        <a-form-item v-if="app.subSettings.enable">
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.subscriptionDesc" }}</span>
-                    </template>
-                    Subscription
-                    <a-icon @click="clientsBulkModal.subId = RandomUtil.randomLowerAndNum(16)" type="sync"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-input v-model.trim="clientsBulkModal.subId"></a-input>
-        </a-form-item>
-        <a-form-item v-if="app.tgBotEnable">
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.telegramDesc" }}</span>
-                    </template>
-                    Telegram ChatID
-                    <a-icon type="question-circle"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-input-number style="width: 50%" v-model.number="clientsBulkModal.tgId" min="0"></a-input-number>
-        </a-form-item>
-        <a-form-item v-if="app.ipLimitEnable">
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.IPLimitDesc" }}</span>
-                    </template>
-                    <span>{{ i18n "pages.inbounds.IPLimit" }} </span>
-                    <a-icon type="question-circle"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-input-number v-model.number="clientsBulkModal.limitIp" min="0"></a-input-number>
-        </a-form-item>
-        <a-form-item>
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        0 <span>{{ i18n "pages.inbounds.meansNoLimit" }}</span>
-                    </template>
-                    {{ i18n "pages.inbounds.totalFlow" }}
-                    <a-icon type="question-circle"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-input-number v-model.number="clientsBulkModal.totalGB" :min="0"></a-input-number>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.delayedStart" }}'>
-            <a-switch v-model="clientsBulkModal.delayedStart" @click="clientsBulkModal.expiryTime=0"></a-switch>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.client.expireDays" }}' v-if="clientsBulkModal.delayedStart">
-            <a-input-number v-model.number="delayedExpireDays" :min="0"></a-input-number>
-        </a-form-item>
-        <a-form-item v-else>
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.inbounds.leaveBlankToNeverExpire" }}</span>
-                    </template>
-                    {{ i18n "pages.inbounds.expireDate" }}
-                    <a-icon type="question-circle"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-date-picker v-if="datepicker == 'gregorian'" :show-time="{ format: 'HH:mm:ss' }"
-                format="YYYY-MM-DD HH:mm:ss" :dropdown-class-name="themeSwitcher.currentTheme"
-                v-model="clientsBulkModal.expiryTime"></a-date-picker>
-            <a-persian-datepicker v-else placeholder='{{ i18n "pages.settings.datepickerPlaceholder" }}'
-                value="clientsBulkModal.expiryTime" v-model="clientsBulkModal.expiryTime">
-            </a-persian-datepicker>
-        </a-form-item>
-        <a-form-item v-if="clientsBulkModal.expiryTime != 0">
-            <template slot="label">
-                <a-tooltip>
-                    <template slot="title">
-                        <span>{{ i18n "pages.client.renewDesc" }}</span>
-                    </template>
-                    {{ i18n "pages.client.renew" }}
-                    <a-icon type="question-circle"></a-icon>
-                </a-tooltip>
-            </template>
-            <a-input-number v-model.number="clientsBulkModal.reset" :min="0"></a-input-number>
-        </a-form-item>
-    </a-form>
-</a-modal>
-<script>
-
-    const clientsBulkModal = {
-        visible: false,
-        confirmLoading: false,
-        title: '',
-        okText: '',
-        confirm: null,
-        dbInbound: new DBInbound(),
-        inbound: new Inbound(),
-        quantity: 1,
-        totalGB: 0,
-        limitIp: 0,
-        expiryTime: '',
-        emailMethod: 0,
-        firstNum: 1,
-        lastNum: 1,
-        emailPrefix: "",
-        emailPostfix: "",
-        subId: "",
-        tgId: '',
-        security: "auto",
-        flow: "",
-        delayedStart: false,
-        reset: 0,
-        ok() {
-            clients = [];
-            method = clientsBulkModal.emailMethod;
-            if (method > 1) {
-                start = clientsBulkModal.firstNum;
-                end = clientsBulkModal.lastNum + 1;
-            } else {
-                start = 0;
-                end = clientsBulkModal.quantity;
-            }
-            prefix = (method > 0 && clientsBulkModal.emailPrefix.length > 0) ? clientsBulkModal.emailPrefix : "";
-            useNum = (method > 1);
-            postfix = (method > 2 && clientsBulkModal.emailPostfix.length > 0) ? clientsBulkModal.emailPostfix : "";
-            for (let i = start; i < end; i++) {
-                newClient = clientsBulkModal.newClient(clientsBulkModal.dbInbound.protocol);
-                if (method == 4) newClient.email = "";
-                newClient.email += useNum ? prefix + i.toString() + postfix : prefix + postfix;
-                if (clientsBulkModal.subId.length > 0) newClient.subId = clientsBulkModal.subId;
-                newClient.tgId = clientsBulkModal.tgId;
-                newClient.security = clientsBulkModal.security;
-                newClient.limitIp = clientsBulkModal.limitIp;
-                newClient._totalGB = clientsBulkModal.totalGB;
-                newClient._expiryTime = clientsBulkModal.expiryTime;
-                if (clientsBulkModal.inbound.canEnableTlsFlow()) {
-                    newClient.flow = clientsBulkModal.flow;
-                }
-                newClient.reset = clientsBulkModal.reset;
-                clients.push(newClient);
-            }
-            ObjectUtil.execute(clientsBulkModal.confirm, clients, clientsBulkModal.dbInbound.id);
-        },
-        show({
-            title = '',
-            okText = '{{ i18n "sure" }}',
-            dbInbound = null,
-            confirm = (inbound, dbInbound) => { }
-        }) {
-            this.visible = true;
-            this.title = title;
-            this.okText = okText;
-            this.confirm = confirm;
-            this.quantity = 1;
-            this.totalGB = 0;
-            this.expiryTime = 0;
-            this.emailMethod = 0;
-            this.limitIp = 0;
-            this.firstNum = 1;
-            this.lastNum = 1;
-            this.emailPrefix = "";
-            this.emailPostfix = "";
-            this.subId = "";
-            this.tgId = '';
-            this.security = "auto";
-            this.flow = "";
-            this.dbInbound = new DBInbound(dbInbound);
-            this.inbound = dbInbound.toInbound();
-            this.delayedStart = false;
-            this.reset = 0;
-        },
-        newClient(protocol) {
-            switch (protocol) {
-                case Protocols.VMESS: return new Inbound.VmessSettings.VMESS();
-                case Protocols.VLESS: return new Inbound.VLESSSettings.VLESS();
-                case Protocols.TROJAN: return new Inbound.TrojanSettings.Trojan();
-                case Protocols.SHADOWSOCKS: return new Inbound.ShadowsocksSettings.Shadowsocks(clientsBulkModal.inbound.settings.shadowsockses[0].method);
-                default: return null;
-            }
-        },
-        close() {
-            clientsBulkModal.visible = false;
-            clientsBulkModal.loading(false);
-        },
-        loading(loading = true) {
-            clientsBulkModal.confirmLoading = loading;
-        },
-    };
-
-    const clientsBulkModalApp = new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#client-bulk-modal',
-        data: {
-            clientsBulkModal,
-            get inbound() {
-                return this.clientsBulkModal.inbound;
-            },
-            get delayedExpireDays() {
-                return this.clientsBulkModal.expiryTime < 0 ? this.clientsBulkModal.expiryTime / -86400000 : 0;
-            },
-            get datepicker() {
-                return app.datepicker;
-            },
-            set delayedExpireDays(days) {
-                this.clientsBulkModal.expiryTime = -86400000 * days;
-            },
-        },
-    });
-
-</script>
-{{end}}
\ No newline at end of file
diff --git a/web/html/xui/modals/client_modal.html b/web/html/xui/modals/client_modal.html
deleted file mode 100644
index b6d2a554..00000000
--- a/web/html/xui/modals/client_modal.html
+++ /dev/null
@@ -1,172 +0,0 @@
-{{define "modals/clientsModal"}}
-<a-modal id="client-modal" v-model="clientModal.visible" :title="clientModal.title" @ok="clientModal.ok"
-         :confirm-loading="clientModal.confirmLoading" :closable="true" :mask-closable="false"
-         :class="themeSwitcher.currentTheme"
-         :ok-text="clientModal.okText" cancel-text='{{ i18n "close" }}'>
-    <template v-if="isEdit">
-        <a-tag v-if="isExpiry || isTrafficExhausted" color="red" style="margin-bottom: 10px;display: block;text-align: center;">Account is (Expired|Traffic Ended) And Disabled</a-tag>
-    </template>
-    {{template "form/client"}}
-</a-modal>
-<script>
-
-    const clientModal = {
-        visible: false,
-        confirmLoading: false,
-        title: '',
-        okText: '',
-        isEdit: false,
-        dbInbound: new DBInbound(),
-        inbound: new Inbound(),
-        clients: [],
-        clientStats: [],
-        oldClientId: "",
-        index: null,
-        clientIps: null,
-        delayedStart: false,
-        ok() {
-            if (clientModal.isEdit) {
-                ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id, clientModal.oldClientId);
-            } else {
-                ObjectUtil.execute(clientModal.confirm, clientModalApp.client, clientModal.dbInbound.id);
-            }
-        },
-        show({ title = '', okText = '{{ i18n "sure" }}', index = null, dbInbound = null, confirm = () => { }, isEdit = false }) {
-            this.visible = true;
-            this.title = title;
-            this.okText = okText;
-            this.isEdit = isEdit;
-            this.dbInbound = new DBInbound(dbInbound);
-            this.inbound = dbInbound.toInbound();
-            this.clients = this.inbound.clients;
-            this.index = index === null ? this.clients.length : index;
-            this.delayedStart = false;
-            if (isEdit) {
-                if (this.clients[index].expiryTime < 0) {
-                    this.delayedStart = true;
-                }
-                this.oldClientId = this.getClientId(dbInbound.protocol, clients[index]);
-            } else {
-                this.addClient(this.inbound.protocol, this.clients);
-            }
-            this.clientStats = this.dbInbound.clientStats.find(row => row.email === this.clients[this.index].email);
-            this.confirm = confirm;
-        },  
-        getClientId(protocol, client) {
-            switch (protocol) {
-                case Protocols.TROJAN: return client.password;
-                case Protocols.SHADOWSOCKS: return client.email;
-                default: return client.id;
-            }
-        },
-        addClient(protocol, clients) {
-            switch (protocol) {
-                case Protocols.VMESS: return clients.push(new Inbound.VmessSettings.VMESS());
-                case Protocols.VLESS: return clients.push(new Inbound.VLESSSettings.VLESS());
-                case Protocols.TROJAN: return clients.push(new Inbound.TrojanSettings.Trojan());
-                case Protocols.SHADOWSOCKS: return clients.push(new Inbound.ShadowsocksSettings.Shadowsocks(clients[0].method));
-                default: return null;
-            }
-        },
-        close() {
-            clientModal.visible = false;
-            clientModal.loading(false);
-        },
-        loading(loading=true) {
-            clientModal.confirmLoading = loading;
-        },
-    };
-
-    const clientModalApp = new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#client-modal',
-        data: {
-            clientModal,
-            get inbound() {
-                return this.clientModal.inbound;
-            },
-            get client() {
-                return this.clientModal.clients[this.clientModal.index];
-            },
-            get clientStats() {
-                return this.clientModal.clientStats;
-            },
-            get isEdit() {
-                return this.clientModal.isEdit;
-            },
-            get datepicker() {
-                return app.datepicker;
-            },
-            get isTrafficExhausted() {
-                if (!clientStats) return false
-                if (clientStats.total <= 0) return false
-                if (clientStats.up + clientStats.down < clientStats.total) return false
-                return true
-            },
-            get isExpiry() {
-                return this.clientModal.isEdit && this.client.expiryTime >0 ? (this.client.expiryTime < new Date().getTime()) : false;
-            },
-            get delayedStart() {
-                return this.clientModal.delayedStart;
-            },
-            set delayedStart(value) {
-                this.clientModal.delayedStart = value;
-            },
-            get delayedExpireDays() {
-                return this.client && this.client.expiryTime < 0 ? this.client.expiryTime / -86400000 : 0;
-            },
-            set delayedExpireDays(days) {
-                this.client.expiryTime = -86400000 * days;
-            },
-        },
-        methods: {
-            async getDBClientIps(email) {
-                const msg = await HttpUtil.post(`/panel/inbound/clientIps/${email}`);
-                if (!msg.success) {
-                    document.getElementById("clientIPs").value = msg.obj;
-                    return;
-                }
-                let ips = msg.obj;
-                if (typeof ips === 'string' && ips.startsWith('[') && ips.endsWith(']')) {
-                    try {
-                        ips = JSON.parse(ips);
-                        ips = Array.isArray(ips) ? ips.join("\n") : ips;
-                    } catch (e) {
-                        console.error('Error parsing JSON:', e);
-                    }
-                }
-                document.getElementById("clientIPs").value = ips;
-            },
-            async clearDBClientIps(email) {
-                try {
-                    const msg = await HttpUtil.post(`/panel/inbound/clearClientIps/${email}`);
-                    if (!msg.success) {
-                        return;
-                    }
-                    document.getElementById("clientIPs").value = "";
-                } catch (error) {
-                }
-            },
-            resetClientTraffic(email, dbInboundId, iconElement) {
-                this.$confirm({
-                    title: '{{ i18n "pages.inbounds.resetTraffic"}}',
-                    content: '{{ i18n "pages.inbounds.resetTrafficContent"}}',
-                    class: themeSwitcher.currentTheme,
-                    okText: '{{ i18n "reset"}}',
-                    cancelText: '{{ i18n "cancel"}}',
-                    onOk: async () => {
-                        iconElement.disabled = true;
-                        const msg = await HttpUtil.postWithModal('/panel/inbound/' + dbInboundId + '/resetClientTraffic/' + email);
-                        if (msg.success) {
-                            this.clientModal.clientStats.up = 0;
-                            this.clientModal.clientStats.down = 0;
-                        }
-                        iconElement.disabled = false;
-                    },
-                })
-            },
-        },
-    });
-
-</script>
-{{end}}
diff --git a/web/html/xui/modals/dns_modal.html b/web/html/xui/modals/dns_modal.html
deleted file mode 100644
index a1ebaa9f..00000000
--- a/web/html/xui/modals/dns_modal.html
+++ /dev/null
@@ -1,114 +0,0 @@
-{{define "modals/dnsModal"}}
-<a-modal id="dns-modal" v-model="dnsModal.visible" :title="dnsModal.title" @ok="dnsModal.ok" :closable="true"
-  :mask-closable="false" :ok-text="dnsModal.okText" cancel-text='{{ i18n "close" }}'
-  :class="themeSwitcher.currentTheme">
-  <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-    <a-form-item label='{{ i18n "pages.xray.outbound.address" }}'>
-      <a-input v-model.trim="dnsModal.dnsServer.address"></a-input>
-    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.dns.domains" }}'>
-      <a-button icon="plus" size="small" type="primary" @click="dnsModal.dnsServer.domains.push('')"></a-button>
-      <template v-for="(domain, index) in dnsModal.dnsServer.domains">
-        <a-input v-model.trim="dnsModal.dnsServer.domains[index]">
-          <a-button icon="minus" size="small" slot="addonAfter"
-            @click="dnsModal.dnsServer.domains.splice(index,1)"></a-button>
-        </a-input>
-      </template>
-    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.dns.strategy" }}' v-if="isAdvanced">
-      <a-select v-model="dnsModal.dnsServer.queryStrategy" style="width: 100%"
-        :dropdown-class-name="themeSwitcher.currentTheme">
-        <a-select-option :value="l" :label="l" v-for="l in ['UseIP', 'UseIPv4', 'UseIPv6']"> [[ l ]] </a-select-option>
-      </a-select>
-    </a-form-item>
-    <a-form-item label='Skip Fallback' v-if="isAdvanced">
-      <a-switch v-model="dnsModal.dnsServer.skipFallback"></a-switch>
-    </a-form-item>
-    <a-form-item label='{{ i18n "pages.xray.dns.expectIPs"}}'>
-      <a-button icon="plus" size="small" type="primary" @click="dnsModal.dnsServer.expectIPs.push('')"></a-button>
-      <template v-for="(domain, index) in dnsModal.dnsServer.expectIPs">
-        <a-input v-model.trim="dnsModal.dnsServer.expectIPs[index]">
-          <a-button icon="minus" size="small" slot="addonAfter"
-            @click="dnsModal.dnsServer.expectIPs.splice(index,1)"></a-button>
-        </a-input>
-      </template>
-    </a-form-item>
-  </a-form>
-</a-modal>
-<script>
-  const dnsModal = {
-    title: '',
-    visible: false,
-    okText: '{{ i18n "confirm" }}',
-    isEdit: false,
-    confirm: null,
-    dnsServer: {
-      address: "localhost",
-      domains: [],
-      expectIPs: [],
-      queryStrategy: 'UseIP',
-      skipFallback: true,
-    },
-    ok() {
-      domains = dnsModal.dnsServer.domains.filter(d => d.length > 0);
-      expectIPs = dnsModal.dnsServer.expectIPs.filter(ip => ip.length > 0);
-      dnsModal.dnsServer.domains = domains;
-      dnsModal.dnsServer.expectIPs = expectIPs;
-      newDnsServer = (domains.length > 0 || expectIPs.length > 0) ? dnsModal.dnsServer : dnsModal.dnsServer.address;
-      ObjectUtil.execute(dnsModal.confirm, newDnsServer);
-    },
-
-    show({
-      title = '',
-      okText = '{{ i18n "confirm" }}',
-      dnsServer,
-      confirm = (dnsServer) => { },
-      isEdit = false
-    }) {
-      this.title = title;
-      this.okText = okText;
-      this.confirm = confirm;
-      this.visible = true;
-      if (isEdit) {
-        if (typeof dnsServer == 'object') {
-          this.dnsServer = dnsServer;
-        } else {
-          this.dnsServer = {
-            address: dnsServer ?? "",
-            domains: [],
-            expectIPs: [],
-            queryStrategy: 'UseIP',
-            skipFallback: true,
-          }
-        }
-      } else {
-        this.dnsServer = {
-          address: "localhost",
-          domains: [],
-          expectIPs: [],
-          queryStrategy: 'UseIP',
-          skipFallback: true,
-        }
-      }
-      this.isEdit = isEdit;
-    },
-    close() {
-      dnsModal.visible = false;
-    },
-  };
-  new Vue({
-    delimiters: ['[[', ']]'],
-    el: '#dns-modal',
-    data: {
-      dnsModal: dnsModal,
-    },
-    computed: {
-      isAdvanced: {
-        get: function () {
-          return dnsModal.dnsServer.domains.length > 0;
-        }
-      }
-    }
-  });
-</script>
-{{end}}
\ No newline at end of file
diff --git a/web/html/xui/modals/fakedns_modal.html b/web/html/xui/modals/fakedns_modal.html
deleted file mode 100644
index 8e554ac0..00000000
--- a/web/html/xui/modals/fakedns_modal.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{define "modals/fakednsModal"}}
-<a-modal id="fakedns-modal" v-model="fakednsModal.visible" :title="fakednsModal.title" @ok="fakednsModal.ok"
-         :closable="true" :mask-closable="false"
-         :ok-text="fakednsModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
-    <a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-        <a-form-item label='{{ i18n "pages.xray.fakedns.ipPool" }}'>
-            <a-input v-model.trim="fakednsModal.fakeDns.ipPool"></a-input>
-        </a-form-item>
-        <a-form-item label='{{ i18n "pages.xray.fakedns.poolSize" }}'>
-          <a-input-number v-model.number="fakednsModal.fakeDns.poolSize" :min="1"></a-input-number>
-        </a-form-item>
-    </a-form>
-</a-modal>
-<script>
-    const fakednsModal = {
-        title: '',
-        visible: false,
-        okText: '{{ i18n "confirm" }}',
-        isEdit: false,
-        confirm: null,
-        fakeDns: {
-          ipPool: "198.18.0.0/16",
-          poolSize: 65535,
-        },
-        ok() {
-          ObjectUtil.execute(fakednsModal.confirm, fakednsModal.fakeDns);
-        },
-        show({ title='', okText='{{ i18n "confirm" }}', fakeDns, confirm=(fakeDns)=>{}, isEdit=false  }) {
-            this.title = title;
-            this.okText = okText;
-            this.confirm = confirm;
-            this.visible = true;
-            if(isEdit) {
-                this.fakeDns = fakeDns;
-            } else {
-              this.fakeDns = {
-                ipPool: "198.18.0.0/16",
-                poolSize: 65535,
-              }
-            }
-            this.isEdit = isEdit;
-        },
-        close() {
-            fakednsModal.visible = false;
-        },
-    };
-
-    new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#fakedns-modal',
-        data: {
-            fakednsModal: fakednsModal,
-        }
-    });
-
-</script>
-{{end}}
diff --git a/web/html/xui/modals/inbound_info_modal.html b/web/html/xui/modals/inbound_info_modal.html
deleted file mode 100644
index 50a52190..00000000
--- a/web/html/xui/modals/inbound_info_modal.html
+++ /dev/null
@@ -1,572 +0,0 @@
-{{define "modals/inboundInfoModal"}}
-<a-modal id="inbound-info-modal" v-model="infoModal.visible" title='{{ i18n "pages.inbounds.details"}}' :closable="true" :mask-closable="true" :footer="null" width="600px" :class="themeSwitcher.currentTheme">
-  <a-row>
-    <a-col :xs="24" :md="12">
-      <table>
-        <tr>
-          <td>{{ i18n "protocol" }}</td>
-          <td>
-            <a-tag color="purple">[[ dbInbound.protocol ]]</a-tag>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "pages.inbounds.address" }}</td>
-          <td>
-            <a-tooltip :title="[[ dbInbound.address ]]">
-              <a-tag class="info-large-tag">[[ dbInbound.address ]]</a-tag>
-            </a-tooltip>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "pages.inbounds.port" }}</td>
-          <td>
-            <a-tag>[[ dbInbound.port ]]</a-tag>
-          </td>
-        </tr>
-      </table>
-    </a-col>
-    <a-col :xs="24" :md="12">
-      <template v-if="dbInbound.isVMess || dbInbound.isVLess || dbInbound.isTrojan || dbInbound.isSS">
-        <table>
-          <tr>
-            <td>{{ i18n "transmission" }}</td>
-            <td>
-              <a-tag color="green">[[ inbound.network ]]</a-tag>
-            </td>
-          </tr>
-          <template v-if="inbound.isTcp || inbound.isWs || inbound.isHttpupgrade || inbound.isXHTTP">
-            <tr>
-              <td>{{ i18n "host" }}</td>
-              <td v-if="inbound.host">
-                <a-tooltip :title="[[ inbound.host ]]">
-                  <a-tag class="info-large-tag">[[ inbound.host ]]</a-tag>
-                </a-tooltip>
-              </td>
-              <td v-else>
-                <a-tag color="orange">{{ i18n "none" }}</a-tag>
-              </td>
-            </tr>
-            </tr>
-            <tr>
-              <td>{{ i18n "path" }}</td>
-              <td v-if="inbound.path">
-                <a-tooltip :title="[[ inbound.path ]]">
-                  <a-tag class="info-large-tag">[[ inbound.path ]]</a-tag>
-                </a-tooltip>
-              <td v-else>
-                <a-tag color="orange">{{ i18n "none" }}</a-tag>
-              </td>
-            </tr>
-          </template>
-          <template v-if="inbound.isXHTTP">
-            <tr>
-              <td>Mode</td>
-              <td>
-                <a-tag>[[ inbound.stream.xhttp.mode ]]</a-tag>
-              </td>
-            </tr>
-          </template>
-          <template v-if="inbound.isKcp">
-            <tr>
-              <td>kcp {{ i18n "encryption" }}</td>
-              <td>
-                <a-tag>[[ inbound.kcpType ]]</a-tag>
-              </td>
-            </tr>
-            <tr>
-              <td>kcp {{ i18n "password" }}</td>
-              <td>
-                <a-tag>[[ inbound.kcpSeed ]]</a-tag>
-              </td>
-            </tr>
-          </template>
-          <template v-if="inbound.isGrpc">
-            <tr>
-              <td>grpc serviceName</td>
-              <td>
-                <a-tooltip :title="[[ inbound.serviceName ]]">
-                  <a-tag class="info-large-tag">[[ inbound.serviceName ]]</a-tag>
-                </a-tooltip>
-            <tr>
-              <td>grpc multiMode</td>
-              <td>
-                <a-tag>[[ inbound.stream.grpc.multiMode ]]</a-tag>
-              </td>
-            </tr>
-          </template>
-        </table>
-      </template>
-    </a-col>
-    <template v-if="dbInbound.hasLink()">
-      {{ i18n "security" }}
-      <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
-      <br />
-      <template v-if="inbound.stream.security != 'none'">
-        {{ i18n "domainName" }}
-        <a-tag v-if="inbound.serverName" :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
-        <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
-      </template>
-    </template>
-    <table v-if="dbInbound.isSS" style="margin-bottom: 10px; width: 100%;">
-      <tr>
-        <td>{{ i18n "encryption" }}</td>
-        <td>
-          <a-tag color="green">[[ inbound.settings.method ]]</a-tag>
-        </td>
-      </tr>
-      <tr v-if="inbound.isSS2022">
-        <td>{{ i18n "password" }}</td>
-        <td>
-          <a-tooltip :title="[[ inbound.settings.password  ]]">
-            <a-tag class="info-large-tag">[[ inbound.settings.password ]]</a-tag>
-          </a-tooltip>
-        </td>
-      </tr>
-      <tr>
-        <td>{{ i18n "pages.inbounds.network" }}</td>
-        <td>
-          <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
-        </td>
-      </tr>
-    </table>
-    <template v-if="infoModal.clientSettings">
-      <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider>
-      <table style="margin-bottom: 10px;">
-        <tr>
-          <td>{{ i18n "pages.inbounds.email" }}</td>
-          <td v-if="infoModal.clientSettings.email">
-            <a-tag color="green">[[ infoModal.clientSettings.email ]]</a-tag>
-          </td>
-          <td v-else>
-            <a-tag color="red">{{ i18n "none" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.id">
-          <td>ID</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.id ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="dbInbound.isVMess">
-          <td>{{ i18n "security" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.security ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.inbound.canEnableTlsFlow()">
-          <td>Flow</td>
-          <td v-if="infoModal.clientSettings.flow">
-            <a-tag>[[ infoModal.clientSettings.flow ]]</a-tag>
-          </td>
-          <td v-else>
-            <a-tag color="orange">{{ i18n "none" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.password">
-          <td>{{ i18n "password" }}</td>
-          <td>
-            <a-tooltip :title="[[ infoModal.clientSettings.password  ]]">
-              <a-tag class="info-large-tag">[[ infoModal.clientSettings.password ]]</a-tag>
-            </a-tooltip>
-          </td>
-        </tr>
-        <tr>
-          <td>{{ i18n "status" }}</td>
-          <td>
-            <a-tag v-if="isEnable" color="green">{{ i18n "enabled" }}</a-tag>
-            <a-tag v-else>{{ i18n "disabled" }}</a-tag>
-            <a-tag v-if="!isActive" color="red">{{ i18n "depleted" }}</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientStats">
-          <td>{{ i18n "usage" }}</td>
-          <td>
-            <a-tag color="green">[[ SizeFormatter.sizeFormat(infoModal.clientStats.up + infoModal.clientStats.down) ]]</a-tag>
-            <a-tag>↑ [[ SizeFormatter.sizeFormat(infoModal.clientStats.up) ]] / [[ SizeFormatter.sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
-          </td>
-        </tr>
-        <tr v-if="infoModal.clientSettings.comment">
-          <td>{{ i18n "comment" }}</td>
-          <td>
-            <a-tooltip :title="[[ infoModal.clientSettings.comment  ]]">
-              <a-tag class="info-large-tag">[[ infoModal.clientSettings.comment ]]</a-tag>
-            </a-tooltip>
-          </td>
-        </tr>
-        <tr v-if="app.ipLimitEnable">
-          <td>{{ i18n "pages.inbounds.IPLimit" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientSettings.limitIp ]]</a-tag>
-          </td>
-        </tr>
-        <tr v-if="app.ipLimitEnable">
-          <td>{{ i18n "pages.inbounds.IPLimitlog" }}</td>
-          <td>
-            <a-tag>[[ infoModal.clientIps ]]</a-tag>
-            <a-icon type="sync" :spin="refreshing" @click="refreshIPs" style="margin: 0 5px;"></a-icon>
-            <a-tooltip :title="[[ dbInbound.address ]]">
-              <template slot="title">
-                <span>{{ i18n "pages.inbounds.IPLimitlogclear" }}</span>
-              </template>
-              <a-icon type="delete" @click="clearClientIps"></a-icon>
-            </a-tooltip>
-          </td>
-        </tr>
-      </table>
-      <table style="display: inline-table; margin-block: 10px; width: 100%; text-align: center;">
-        <tr>
-          <th>{{ i18n "remained" }}</th>
-          <th>{{ i18n "pages.inbounds.totalFlow" }}</th>
-          <th>{{ i18n "pages.inbounds.expireDate" }}</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag v-if="infoModal.clientStats && infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ getRemStats() ]] </a-tag>
-          </td>
-          <td>
-            <a-tag v-if="infoModal.clientSettings.totalGB > 0" :color="statsColor(infoModal.clientStats)"> [[ SizeFormatter.sizeFormat(infoModal.clientSettings.totalGB) ]] </a-tag>
-            <a-tag v-else color="purple" class="infinite-tag">
-              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-              </svg>
-            </a-tag>
-          </td>
-          <td>
-            <template v-if="infoModal.clientSettings.expiryTime > 0">
-              <a-tag :color="ColorUtils.usageColor(new Date().getTime(), app.expireDiff, infoModal.clientSettings.expiryTime)"> 
-                <template v-if="app.datepicker === 'gregorian'">
-                  [[ DateUtil.formatMillis(infoModal.clientSettings.expiryTime) ]]
-                </template>
-                <template v-else>
-                  [[ DateUtil.convertToJalalian(moment(infoModal.clientSettings.expiryTime)) ]]
-                </template>
-              </a-tag>
-            </template>
-            <a-tag v-else-if="infoModal.clientSettings.expiryTime < 0" color="green">[[ infoModal.clientSettings.expiryTime / -86400000 ]] {{ i18n "pages.client.days" }}
-            </a-tag>
-            <a-tag v-else color="purple" class="infinite-tag">
-              <svg height="10px" width="14px" viewBox="0 0 640 512" fill="currentColor">
-                <path d="M484.4 96C407 96 349.2 164.1 320 208.5C290.8 164.1 233 96 155.6 96C69.75 96 0 167.8 0 256s69.75 160 155.6 160C233.1 416 290.8 347.9 320 303.5C349.2 347.9 407 416 484.4 416C570.3 416 640 344.2 640 256S570.3 96 484.4 96zM155.6 368C96.25 368 48 317.8 48 256s48.25-112 107.6-112c67.75 0 120.5 82.25 137.1 112C276 285.8 223.4 368 155.6 368zM484.4 368c-67.75 0-120.5-82.25-137.1-112C364 226.2 416.6 144 484.4 144C543.8 144 592 194.2 592 256S543.8 368 484.4 368z" fill="currentColor"></path>
-              </svg>
-            </a-tag>
-          </td>
-        </tr>
-      </table>
-      <template v-if="app.subSettings.enable && infoModal.clientSettings.subId">
-        <a-divider>Subscription URL</a-divider>
-        <tr-info-row class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="purple">Subscription Link</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.subLink)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <a :href="[[ infoModal.subLink ]]" target="_blank">[[ infoModal.subLink ]]</a>
-        </tr-info-row>
-        <tr-info-row class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="purple">Json Link</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.subJsonLink)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <a :href="[[ infoModal.subJsonLink ]]" target="_blank">[[ infoModal.subJsonLink ]]</a>
-        </tr-info-row>
-      </template>
-      <template v-if="app.tgBotEnable && infoModal.clientSettings.tgId">
-        <a-divider>Telegram ChatID</a-divider>
-        <tr-info-row class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag color="blue">[[ infoModal.clientSettings.tgId ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button size="small" icon="snippets" @click="copy(infoModal.clientSettings.tgId)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-        </tr-info-row>
-      </template>
-      <template v-if="dbInbound.hasLink()">
-        <a-divider>URL</a-divider>
-        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(link.link)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <code>[[ link.link ]]</code>
-        </tr-info-row>
-      </template>
-    </template>
-    <template v-else>
-      <template v-if="dbInbound.isSS && !inbound.isSSMultiUser">
-        <a-divider>URL</a-divider>
-        <tr-info-row v-for="(link,index) in infoModal.links" class="tr-info-row">
-          <tr-info-title class="tr-info-title">
-            <a-tag class="tr-info-tag" color="green">[[ link.remark ]]</a-tag>
-            <a-tooltip title='{{ i18n "copy" }}'>
-              <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(link.link)"></a-button>
-            </a-tooltip>
-          </tr-info-title>
-          <code>[[ link.link ]]</code>
-        </tr-info-row>
-      </template>
-      <table v-if="inbound.protocol == Protocols.DOKODEMO" class="tr-info-table">
-        <tr>
-          <th>{{ i18n "pages.inbounds.targetAddress" }}</th>
-          <th>{{ i18n "pages.inbounds.destinationPort" }}</th>
-          <th>{{ i18n "pages.inbounds.network" }}</th>
-          <th>FollowRedirect</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag color="green">[[ inbound.settings.address ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.port ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.network ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.followRedirect ]]</a-tag>
-          </td>
-        </tr>
-      </table>
-      <table v-if="dbInbound.isSocks" class="tr-info-table">
-        <tr>
-          <th>{{ i18n "password" }} Auth</th>
-          <th>{{ i18n "pages.inbounds.enable" }} udp</th>
-          <th>IP</th>
-        </tr>
-        <tr>
-          <td>
-            <a-tag color="green">[[ inbound.settings.auth ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.udp]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ inbound.settings.ip ]]</a-tag>
-          </td>
-        </tr>
-        <template v-if="inbound.settings.auth == 'password'">
-          <tr>
-            <td></td>
-            <td>{{ i18n "username" }}</td>
-            <td>{{ i18n "password" }}</td>
-          </tr>
-          <tr v-for="account,index in inbound.settings.accounts">
-            <td>[[ index ]]</td>
-            <td>
-              <a-tag color="green">[[ account.user ]]</a-tag>
-            </td>
-            <td>
-              <a-tag color="green">[[ account.pass ]]</a-tag>
-            </td>
-          </tr>
-        </template>
-      </table>
-      <table v-if="dbInbound.isHTTP" class="tr-info-table">
-        <tr>
-          <th></th>
-          <th>{{ i18n "username" }}</th>
-          <th>{{ i18n "password" }}</th>
-        </tr>
-        <tr v-for="account,index in inbound.settings.accounts">
-          <td>[[ index ]]</td>
-          <td>
-            <a-tag color="green">[[ account.user ]]</a-tag>
-          </td>
-          <td>
-            <a-tag color="green">[[ account.pass ]]</a-tag>
-          </td>
-        </tr>
-      </table>
-      <table v-if="dbInbound.isWireguard" class="tr-info-table">
-        <tr class="client-table-odd-row">
-          <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
-          <td>[[ inbound.settings.secretKey ]]</td>
-        </tr>
-        <tr>
-          <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
-          <td>[[ inbound.settings.pubKey ]]</td>
-        </tr>
-        <tr class="client-table-odd-row">
-          <td>MTU</td>
-          <td>[[ inbound.settings.mtu ]]</td>
-        </tr>
-        <tr>
-          <td>No Kernel Tun</td>
-          <td>[[ inbound.settings.noKernelTun ]]</td>
-        </tr>
-        <template v-for="(peer, index) in inbound.settings.peers">
-          <tr>
-            <td colspan="2">
-              <a-divider>Peer [[ index + 1 ]]</a-divider>
-            </td>
-          </tr>
-          <tr class="client-table-odd-row">
-            <td>{{ i18n "pages.xray.wireguard.secretKey" }}</td>
-            <td>[[ peer.privateKey ]]</td>
-          </tr>
-          <tr>
-            <td>{{ i18n "pages.xray.wireguard.publicKey" }}</td>
-            <td>[[ peer.publicKey ]]</td>
-          </tr>
-          <tr class="client-table-odd-row">
-            <td>{{ i18n "pages.xray.wireguard.psk" }}</td>
-            <td>[[ peer.psk ]]</td>
-          </tr>
-          <tr>
-            <td>{{ i18n "pages.xray.wireguard.allowedIPs" }}</td>
-            <td>[[ peer.allowedIPs.join(",") ]]</td>
-          </tr>
-          <tr class="client-table-odd-row">
-            <td>Keep Alive</td>
-            <td>[[ peer.keepAlive ]]</td>
-          </tr>
-          <tr>
-            <td colspan="2">
-              <tr-info-row class="tr-info-row">
-                <tr-info-title class="tr-info-title">
-                  <a-tag color="blue">Config</a-tag>
-                  <a-tooltip title='{{ i18n "copy" }}'>
-                    <a-button style="min-width: 24px;" size="small" icon="snippets" @click="copy(infoModal.links[index])"></a-button>
-                  </a-tooltip>
-                </tr-info-title>
-                <div v-html="infoModal.links[index].replaceAll(`\n`,`<br />`)" style="border-radius: 1rem; padding: 0.5rem;" class="client-table-odd-row">
-                </div>
-              </tr-info-row>
-            </td>
-          </tr>
-      </table>
-    </template>
-    </template>
-</a-modal>
-<script>
-  function refreshIPs(email) {
-    return HttpUtil.post(`/panel/inbound/clientIps/${email}`).then((msg) => {
-      if (msg.success) {
-        try {
-          return JSON.parse(msg.obj).join(', ');
-        } catch (e) {
-          return msg.obj;
-        }
-      }
-    });
-  }
-
-  const infoModal = {
-    visible: false,
-    inbound: new Inbound(),
-    dbInbound: new DBInbound(),
-    clientSettings: null,
-    clientStats: [],
-    upStats: 0,
-    downStats: 0,
-    links: [],
-    index: null,
-    isExpired: false,
-    subLink: '',
-    subJsonLink: '',
-    clientIps: '',
-    show(dbInbound, index) {
-      this.index = index;
-      this.inbound = dbInbound.toInbound();
-      this.dbInbound = new DBInbound(dbInbound);
-      this.clientSettings = this.inbound.clients ? this.inbound.clients[index] : null;
-      this.isExpired = this.inbound.clients ? this.inbound.isExpiry(index) : this.dbInbound.isExpiry;
-      this.clientStats = this.inbound.clients ? this.dbInbound.clientStats.find(row => row.email === this.clientSettings.email) : [];
-
-      if (app.ipLimitEnable && this.clientSettings.limitIp) {
-        refreshIPs(this.clientStats.email).then((ips) => {
-          this.clientIps = ips;
-        })
-      }
-      if (this.inbound.protocol == Protocols.WIREGUARD) {
-        this.links = this.inbound.genInboundLinks(dbInbound.remark).split('\r\n')
-      } else {
-        this.links = this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, this.clientSettings);
-      }
-      if (this.clientSettings) {
-        if (this.clientSettings.subId) {
-          this.subLink = this.genSubLink(this.clientSettings.subId);
-          this.subJsonLink = this.genSubJsonLink(this.clientSettings.subId);
-        }
-      }
-      this.visible = true;
-    },
-    close() {
-      infoModal.visible = false;
-    },
-    genSubLink(subID) {
-      return app.subSettings.subURI + subID;
-    },
-    genSubJsonLink(subID) {
-      return app.subSettings.subJsonURI + subID;
-    }
-  };
-  const infoModalApp = new Vue({
-    delimiters: ['[[', ']]'],
-    el: '#inbound-info-modal',
-    data: {
-      infoModal,
-      refreshing: false,
-      get dbInbound() {
-        return this.infoModal.dbInbound;
-      },
-      get inbound() {
-        return this.infoModal.inbound;
-      },
-      get isActive() {
-        if (infoModal.clientStats) {
-          return infoModal.clientStats.enable;
-        }
-        return true;
-      },
-      get isEnable() {
-        if (infoModal.clientSettings) {
-          return infoModal.clientSettings.enable;
-        }
-        return infoModal.dbInbound.isEnable;
-      },
-    },
-    methods: {
-      copy(content) {
-        ClipboardManager
-          .copyText(content)
-          .then(() => {
-            app.$message.success('{{ i18n "copied" }}')
-          })
-      },
-      statsColor(stats) {
-        return ColorUtils.usageColor(stats.up + stats.down, app.trafficDiff, stats.total);
-      },
-      getRemStats() {
-        remained = this.infoModal.clientStats.total - this.infoModal.clientStats.up - this.infoModal.clientStats.down;
-        return remained > 0 ? SizeFormatter.sizeFormat(remained) : '-';
-      },
-      refreshIPs() {
-        this.refreshing = true;
-        refreshIPs(this.infoModal.clientStats.email)
-          .then((ips) => {
-            this.infoModal.clientIps = ips;
-          })
-          .finally(() => {
-            this.refreshing = false;
-          });
-      },
-      clearClientIps() {
-        HttpUtil.post(`/panel/inbound/clearClientIps/${this.infoModal.clientStats.email}`)
-          .then((msg) => {
-            if (!msg.success) {
-              return;
-            }
-            this.infoModal.clientIps = 'No IP Record';
-          })
-          .catch(() => {});
-      },
-    },
-  });
-</script>
-{{end}}
diff --git a/web/html/xui/modals/inbound_modal.html b/web/html/xui/modals/inbound_modal.html
deleted file mode 100644
index 99d182b9..00000000
--- a/web/html/xui/modals/inbound_modal.html
+++ /dev/null
@@ -1,144 +0,0 @@
-{{define "modals/inboundModal"}}
-<a-modal id="inbound-modal" v-model="inModal.visible" :title="inModal.title"
-        :dialog-style="{ top: '20px' }" @ok="inModal.ok"
-        :confirm-loading="inModal.confirmLoading" :closable="true" :mask-closable="false"
-        :class="themeSwitcher.currentTheme"
-        :ok-text="inModal.okText" cancel-text='{{ i18n "close" }}'>
-    {{template "form/inbound"}}
-</a-modal>
-<script>
-
-    const inModal = {
-        title: '',
-        visible: false,
-        confirmLoading: false,
-        okText: '{{ i18n "sure" }}',
-        isEdit: false,
-        confirm: null,
-        inbound: new Inbound(),
-        dbInbound: new DBInbound(),
-        ok() {
-            ObjectUtil.execute(inModal.confirm, inModal.inbound, inModal.dbInbound);
-        },
-        show({ title = '', okText = '{{ i18n "sure" }}', inbound = null, dbInbound = null, confirm = (inbound, dbInbound) => {}, isEdit = false }) {
-            this.title = title;
-            this.okText = okText;
-            if (inbound) {
-                this.inbound = Inbound.fromJson(inbound.toJson());
-            } else {
-                this.inbound = new Inbound();
-            }
-            if (dbInbound) {
-                this.dbInbound = new DBInbound(dbInbound);
-            } else {
-                this.dbInbound = new DBInbound();
-            }
-            this.confirm = confirm;
-            this.visible = true;
-            this.isEdit = isEdit;
-        },
-        close() {
-            inModal.visible = false;
-            inModal.loading(false);
-        },
-        loading(loading=true) {
-            inModal.confirmLoading = loading;
-        },
-    };
-
-    new Vue({
-        delimiters: ['[[', ']]'],
-        el: '#inbound-modal',
-        data: {
-            inModal: inModal,
-            delayedStart: false,
-            get inbound() {
-                return inModal.inbound;
-            },
-            get dbInbound() {
-                return inModal.dbInbound;
-            },
-            get isEdit() {
-                return inModal.isEdit;
-            },
-            get client() {
-                return inModal.inbound.clients[0];
-            },
-            get datepicker() {
-                return app.datepicker;
-            },
-            get delayedExpireDays() {
-                return this.client && this.client.expiryTime < 0 ? this.client.expiryTime / -86400000 : 0;
-            },
-            set delayedExpireDays(days) {
-                this.client.expiryTime = -86400000 * days;
-            },
-            get externalProxy() {
-                return this.inbound.stream.externalProxy.length > 0;
-            },
-            set externalProxy(value) {
-                if (value) {
-                    inModal.inbound.stream.externalProxy = [{
-                        forceTls: "same",
-                        dest: window.location.hostname,
-                        port: inModal.inbound.port,
-                        remark: ""
-                    }];
-                } else {
-                    inModal.inbound.stream.externalProxy = [];
-                }
-            }
-        },
-        methods: {
-            streamNetworkChange() {
-                if (!inModal.inbound.canEnableTls()) {
-                    this.inModal.inbound.stream.security = 'none';
-                }
-                if (!inModal.inbound.canEnableReality()) {
-                    this.inModal.inbound.reality = false;
-                }
-                if (this.inModal.inbound.protocol == Protocols.VLESS && !inModal.inbound.canEnableTlsFlow()) {
-                    this.inModal.inbound.settings.vlesses.forEach(client => {
-                        client.flow = "";
-                    });
-                }
-            },
-            SSMethodChange() {
-                if (this.inModal.inbound.isSSMultiUser) {
-                    if (this.inModal.inbound.settings.shadowsockses.length ==0){
-                        this.inModal.inbound.settings.shadowsockses = [new Inbound.ShadowsocksSettings.Shadowsocks()];
-                    }
-                    if (!this.inModal.inbound.isSS2022) {
-                        this.inModal.inbound.settings.shadowsockses.forEach(client => {
-                            client.method = this.inModal.inbound.settings.method;
-                        })
-                    } else {
-                        this.inModal.inbound.settings.shadowsockses.forEach(client => {
-                            client.method = "";
-                        })
-                    }
-                } else {
-                    if (this.inModal.inbound.settings.shadowsockses.length > 0){
-                        this.inModal.inbound.settings.shadowsockses = [];
-                    }
-                }
-            },
-            setDefaultCertData(index) {
-                inModal.inbound.stream.tls.certs[index].certFile = app.defaultCert;
-                inModal.inbound.stream.tls.certs[index].keyFile = app.defaultKey;
-            },
-            async getNewX25519Cert() {
-                inModal.loading(true);
-                const msg = await HttpUtil.post('/server/getNewX25519Cert');
-                inModal.loading(false);
-                if (!msg.success) {
-                    return;
-                }
-                inModal.inbound.stream.reality.privateKey = msg.obj.privateKey;
-                inModal.inbound.stream.reality.settings.publicKey = msg.obj.publicKey;
-            }
-        },
-    });
-
-</script>
-{{end}}
diff --git a/web/html/xui/modals/prompt_modal.html b/web/html/xui/modals/prompt_modal.html
deleted file mode 100644
index 5073650f..00000000
--- a/web/html/xui/modals/prompt_modal.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{{define "modals/promptModal"}}
-<a-modal id="prompt-modal" v-model="promptModal.visible" :title="promptModal.title"
-         :closable="true" @ok="promptModal.ok" :mask-closable="false"
-         :confirm-loading="promptModal.confirmLoading"
-         :ok-text="promptModal.okText" cancel-text='{{ i18n "cancel" }}' :class="themeSwitcher.currentTheme">
-    <a-input id="prompt-modal-input" :type="promptModal.type"
-             v-model="promptModal.value"
-             :autosize="{minRows: 10, maxRows: 20}"
-             @keydown.enter.native="promptModal.keyEnter"
-             @keydown.ctrl.83="promptModal.ctrlS"></a-input>
-</a-modal>
-
-<script>
-
-    const promptModal = {
-        title: '',
-        type: '',
-        value: '',
-        okText: '{{ i18n "sure"}}',
-        visible: false,
-        confirmLoading: false,
-        keyEnter(e) {
-            if (this.type !== 'textarea') {
-                e.preventDefault();
-                this.ok();
-            }
-        },
-        ctrlS(e) {
-            if (this.type === 'textarea') {
-                e.preventDefault();
-                promptModal.confirm(promptModal.value);
-            }
-        },
-        ok() {
-            promptModal.confirm(promptModal.value);
-        },
-        confirm() {},
-        open({
-            title = '',
-            type = 'text',
-            value = '',
-            okText = '{{ i18n "sure"}}',
-            confirm = () => {},
-        }) {
-            this.title = title;
-            this.type = type;
-            this.value = value;
-            this.okText = okText;
-            this.confirm = confirm;
-            this.visible = true;
-            promptModalApp.$nextTick(() => {
-                document.querySelector('#prompt-modal-input').focus();
-            });
-        },
-        close() {
-            this.visible = false;
-        },
-        loading(loading=true) {
-            this.confirmLoading = loading;
-        },
-    };
-
-    const promptModalApp = new Vue({
-        el: '#prompt-modal',
-        data: {
-            promptModal: promptModal,
-        },
-    });
-
-</script>
-{{end}}
\ No newline at end of file
diff --git a/web/html/xui/modals/qrcode_modal.html b/web/html/xui/modals/qrcode_modal.html
deleted file mode 100644
index 7046ca9b..00000000
--- a/web/html/xui/modals/qrcode_modal.html
+++ /dev/null
@@ -1,161 +0,0 @@
-{{define "modals/qrcodeModal"}}
-<a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-    :dialog-style="DeviceUtils.isMobile() ? { top: '18px' } : {}"
-    :closable="true"
-    :class="themeSwitcher.currentTheme"
-    :footer="null" width="fit-content">
-  <tr-qr-modal class="qr-modal">
-    <template v-if="app.subSettings.enable && qrModal.subId">
-      <tr-qr-box class="qr-box">
-        <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}}</span></a-tag>
-        <tr-qr-bg class="qr-bg-sub">
-          <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copy(genSubLink(qrModal.client.subId))" id="qrCode-sub" class="qr-cv"></canvas>
-          </tr-qr-bg-inner>
-        </tr-qr-bg>
-      </tr-qr-box>
-      <tr-qr-box class="qr-box">
-        <a-tag color="purple" class="qr-tag"><span>{{ i18n "pages.settings.subSettings"}} Json</span></a-tag>
-        <tr-qr-bg class="qr-bg-sub">
-          <tr-qr-bg-inner class="qr-bg-sub-inner">
-            <canvas @click="copy(genSubJsonLink(qrModal.client.subId))" id="qrCode-subJson" class="qr-cv"></canvas>
-          </tr-qr-bg-inner>
-        </tr-qr-bg>
-      </tr-qr-box>
-    </template>
-    <template v-for="(row, index) in qrModal.qrcodes">
-      <tr-qr-box class="qr-box">
-        <a-tag color="green" class="qr-tag"><span>[[ row.remark ]]</span></a-tag>
-        <tr-qr-bg class="qr-bg">
-          <canvas @click="copy(row.link)" :id="'qrCode-'+index" class="qr-cv"></canvas>
-        </tr-qr-bg>
-      </tr-qr-box>
-    </template>
-  </tr-qr-modal>
-</a-modal>
-
-<script>
-  const qrModal = {
-    title: '',
-    dbInbound: new DBInbound(),
-    client: null,
-    qrcodes: [],
-    visible: false,
-    subId: '',
-    show: function(title = '', dbInbound, client) {
-      this.title = title;
-      this.dbInbound = dbInbound;
-      this.inbound = dbInbound.toInbound();
-      this.client = client;
-      this.subId = '';
-      this.qrcodes = [];
-      if (this.inbound.protocol == Protocols.WIREGUARD) {
-        this.inbound.genInboundLinks(dbInbound.remark).split('\r\n').forEach((l, index) => {
-          this.qrcodes.push({
-            remark: "Peer " + (index + 1),
-            link: l
-          });
-        });
-      } else {
-        this.inbound.genAllLinks(this.dbInbound.remark, app.remarkModel, client).forEach(l => {
-          this.qrcodes.push({
-            remark: l.remark,
-            link: l.link
-          });
-        });
-      }
-      this.visible = true;
-    },
-    close: function() {
-      this.visible = false;
-    },
-  };
-  const qrModalApp = new Vue({
-    delimiters: ['[[', ']]'],
-    el: '#qrcode-modal',
-    data: {
-      qrModal: qrModal,
-    },
-    methods: {
-      copy(content) {
-        ClipboardManager
-          .copyText(content)
-          .then(() => {
-            app.$message.success('{{ i18n "copied" }}')
-          })
-      },
-      setQrCode(elementId, content) {
-        new QRious({
-          element: document.querySelector('#' + elementId),
-          size: 400,
-          value: content,
-          background: 'white',
-          backgroundAlpha: 0,
-          foreground: 'black',
-          padding: 2,
-          level: 'L'
-        });
-      },
-      genSubLink(subID) {
-        return app.subSettings.subURI + subID;
-      },
-      genSubJsonLink(subID) {
-        return app.subSettings.subJsonURI + subID;
-      },
-      revertOverflow() {
-        const elements = document.querySelectorAll(".qr-tag");
-        elements.forEach((element) => {
-          element.classList.remove("tr-marquee");
-          element.children[0].style.animation = '';
-          while (element.children.length > 1) {
-            element.removeChild(element.lastChild);
-          }
-        });
-      }
-    },
-    updated() {
-      if (this.qrModal.visible) {
-        fixOverflow();
-      } else {
-        this.revertOverflow();
-      }
-      if (qrModal.client && qrModal.client.subId) {
-        qrModal.subId = qrModal.client.subId;
-        this.setQrCode("qrCode-sub", this.genSubLink(qrModal.subId));
-        this.setQrCode("qrCode-subJson", this.genSubJsonLink(qrModal.subId));
-      }
-      qrModal.qrcodes.forEach((element, index) => {
-        this.setQrCode("qrCode-" + index, element.link);
-      });
-    }
-  });
-
-  function fixOverflow() {
-    const elements = document.querySelectorAll(".qr-tag");
-    elements.forEach((element) => {
-      function isElementOverflowing(element) {
-        const overflowX = element.offsetWidth < element.scrollWidth,
-          overflowY = element.offsetHeight < element.scrollHeight;
-        return overflowX || overflowY;
-      }
-
-      function wrapContentsInMarquee(element) {
-        element.classList.add("tr-marquee");
-        element.children[0].style.animation = `move-ltr ${
-            (element.children[0].clientWidth / element.clientWidth) * 5
-