From 00addb0dd9f6451124466fb7ab6cae9ab9a8a643 Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:38:41 +0000
Subject: chore: delete `display.css` these styles are not used anywhere

---
 web/assets/element-ui/theme-chalk/display.css | 1 -
 web/html/common/head.html                     | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 web/assets/element-ui/theme-chalk/display.css
diff --git a/web/assets/element-ui/theme-chalk/display.css b/web/assets/element-ui/theme-chalk/display.css
deleted file mode 100644
index 1d8790ba..00000000
--- a/web/assets/element-ui/theme-chalk/display.css
+++ /dev/null
@@ -1 +0,0 @@
-@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}
\ No newline at end of file
diff --git a/web/html/common/head.html b/web/html/common/head.html
index ca854a30..4c6bb4e2 100644
--- a/web/html/common/head.html
+++ b/web/html/common/head.html
@@ -5,7 +5,6 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue/antd.min.css">
-  <link rel="stylesheet" href="{{ .base_path }}assets/element-ui/theme-chalk/display.css">
   <link rel="stylesheet" href="{{ .base_path }}assets/css/custom.min.css?{{ .cur_ver }}">
   <style>
     [v-cloak] {
-- 
cgit v1.2.3


From 510c35f450e13fc833ab2c9a59e4822c0c0f658c Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:49:49 +0000
Subject: chore: meta tag change - `X-UA-Compatible` is only used by Internet
 Explorer, so it removed - `robots` allows the panel not to be indexed by a
 search engine

---
 web/html/common/head.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/html/common/head.html b/web/html/common/head.html
index 4c6bb4e2..35901769 100644
--- a/web/html/common/head.html
+++ b/web/html/common/head.html
@@ -2,8 +2,8 @@
 <head>
   <meta charset="UTF-8">
   <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="robots" content="noindex,nofollow">
   <link rel="stylesheet" href="{{ .base_path }}assets/ant-design-vue/antd.min.css">
   <link rel="stylesheet" href="{{ .base_path }}assets/css/custom.min.css?{{ .cur_ver }}">
   <style>
@@ -25,7 +25,7 @@
         'Segoe UI Emoji', 'Segoe UI Symbol';
     }
   </style>
-  <title>{{ .host }}-{{ i18n .title}}</title>
+  <title>{{ .host }} – {{ i18n .title}}</title>
 </head>
 <div id="message"></div>
 {{end}}
\ No newline at end of file
-- 
cgit v1.2.3


From 6f4eefe60181a9913155ec8c1cc644bf78b23ea3 Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:09:05 +0000
Subject: chore: make class to get the device form factor

---
 web/assets/js/util/index.js       | 6 ++++++
 web/html/common/qrcode_modal.html | 3 +--
 web/html/xui/inbounds.html        | 4 ++--
 web/html/xui/index.html           | 2 +-
 web/html/xui/xray.html            | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/assets/js/util/index.js b/web/assets/js/util/index.js
index 85d53352..625af8b9 100644
--- a/web/assets/js/util/index.js
+++ b/web/assets/js/util/index.js
@@ -780,4 +780,10 @@ class LanguageManager {
     
         return languageFilter.length > 0;
     }    
+}
+
+class DeviceUtils {
+    static isMobile() {
+        return window.innerWidth <= 768;
+    }
 }
\ No newline at end of file
diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html
index 5ea1ca95..93d66fc2 100644
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -1,6 +1,6 @@
 {{define "qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
-    :dialog-style="isMobileQr ? { top: '18px' } : {}"
+    :dialog-style="DeviceUtils.isMobile() ? { top: '18px' } : {}"
     :closable="true"
     :class="themeSwitcher.currentTheme"
     :footer="null" width="fit-content">
@@ -35,7 +35,6 @@
 </a-modal>
 
 <script>
-  const isMobileQr = window.innerWidth <= 768;
   const qrModal = {
     title: '',
     dbInbound: new DBInbound(),
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 758de9e8..94333429 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -709,7 +709,7 @@
             showAlert: false,
             ipLimitEnable: false,
             pageSize: 50,
-            isMobile: window.innerWidth <= 768,
+            isMobile: DeviceUtils.isMobile(),
         },
         methods: {
             loading(spinning = true) {
@@ -1473,7 +1473,7 @@
                 return false
             },
             onResize() {
-                this.isMobile = window.innerWidth <= 768;
+              this.isMobile = DeviceUtils.isMobile();
             }
         },
         watch: {
diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index 92b25d5c..c072893d 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -601,7 +601,7 @@
             loadingTip: '{{ i18n "loading"}}',
             showAlert: false,
             showIp: false,
-            isMobile: window.innerWidth <= 768
+            isMobile: DeviceUtils.isMobile()
         },
         methods: {
             loading(spinning, tip = '{{ i18n "loading"}}') {
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 8ba14f7d..f8f3071d 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -877,7 +877,7 @@
             refreshing: false,
             restartResult: '',
             showAlert: false,
-            isMobile: window.innerWidth <= 768,
+            isMobile: DeviceUtils.isMobile(),
             advSettings: 'xraySetting',
             obsSettings: '',
             cm: null,
-- 
cgit v1.2.3


From 7b15274c842b31e8caded3e7f272237f31824852 Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Mon, 24 Mar 2025 09:45:15 +0000
Subject: chore: moving the settings tabs to a separate directory

---
 web/html/xui/settings.html                         | 542 +----------------
 web/html/xui/settings/panel/general.html           | 149 +++++
 web/html/xui/settings/panel/security.html          |  60 ++
 .../xui/settings/panel/subscription/general.html   |  98 +++
 web/html/xui/settings/panel/subscription/json.html | 180 ++++++
 web/html/xui/settings/panel/telegram.html          |  87 +++
 web/html/xui/settings/xray/advanced.html           |  14 +
 web/html/xui/settings/xray/balancers.html          |  53 ++
 web/html/xui/settings/xray/basics.html             | 275 +++++++++
 web/html/xui/settings/xray/dns.html                | 149 +++++
 web/html/xui/settings/xray/outbounds.html          |  72 +++
 web/html/xui/settings/xray/reverse.html            |  38 ++
 web/html/xui/settings/xray/routing.html            | 119 ++++
 web/html/xui/xray.html                             | 676 +--------------------
 14 files changed, 1308 insertions(+), 1204 deletions(-)
 create mode 100644 web/html/xui/settings/panel/general.html
 create mode 100644 web/html/xui/settings/panel/security.html
 create mode 100644 web/html/xui/settings/panel/subscription/general.html
 create mode 100644 web/html/xui/settings/panel/subscription/json.html
 create mode 100644 web/html/xui/settings/panel/telegram.html
 create mode 100644 web/html/xui/settings/xray/advanced.html
 create mode 100644 web/html/xui/settings/xray/balancers.html
 create mode 100644 web/html/xui/settings/xray/basics.html
 create mode 100644 web/html/xui/settings/xray/dns.html
 create mode 100644 web/html/xui/settings/xray/outbounds.html
 create mode 100644 web/html/xui/settings/xray/reverse.html
 create mode 100644 web/html/xui/settings/xray/routing.html

diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html
index febb26e8..1bf5dab8 100644
--- a/web/html/xui/settings.html
+++ b/web/html/xui/settings.html
@@ -109,551 +109,19 @@
             </a-card>
             <a-tabs default-active-key="1">
               <a-tab-pane key="1" tab='{{ i18n "pages.settings.panelSettings" }}' style="padding-top: 20px;">
-                <a-collapse>
-                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>
-                        {{ i18n "pages.settings.remarkModel"}}
-                      </template>
-                      <template #description>
-                        {{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i>
-                      </template>
-                      <template #control>
-                        <a-input-group style="width: 100%;">
-                          <a-select style="padding-right: .5rem; min-width: 80%; width: auto;"
-                              mode="multiple"
-                              v-model="remarkModel"
-                              :dropdown-class-name="themeSwitcher.currentTheme">
-                            <a-select-option v-for="(value, key) in remarkModels" :value="key">[[ value ]]</a-select-option>
-                          </a-select>
-                          <a-select style="width: 20%;" v-model="remarkSeparator" :dropdown-class-name="themeSwitcher.currentTheme">
-                            <a-select-option v-for="key in remarkSeparators" :value="key">[[ key ]]</a-select-option>
-                          </a-select>
-                        </a-input-group>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.panelListeningIP"}}</template>
-                      <template #description>{{ i18n "pages.settings.panelListeningIPDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.webListen"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.panelListeningDomain"}}</template>
-                      <template #description>{{ i18n "pages.settings.panelListeningDomainDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.webDomain"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.panelPort"}}</template>
-                      <template #description>{{ i18n "pages.settings.panelPortDesc"}}</template>
-                      <template #control>
-                        <a-input-number :min="1" :min="65531" v-model="allSetting.webPort" style="width: 100%;"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.panelUrlPath"}}</template>
-                      <template #description>{{ i18n "pages.settings.panelUrlPathDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.webBasePath"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.sessionMaxAge" }}</template>
-                      <template #description>{{ i18n "pages.settings.sessionMaxAgeDesc" }}</template>
-                      <template #control>
-                        <a-input-number :min="60" v-model="allSetting.sessionMaxAge" style="width: 100%;"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.pageSize" }}</template>
-                      <template #description>{{ i18n "pages.settings.pageSizeDesc" }}</template>
-                      <template #control>
-                        <a-input-number :min="0" step="5" v-model="allSetting.pageSize" style="width: 100%;"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.language"}}</template>
-                      <template #control>
-                        <a-select ref="selectLang"
-                            v-model="lang"
-                            @change="LanguageManager.setLanguage(lang)"
-                            :dropdown-class-name="themeSwitcher.currentTheme"
-                            style="width: 100%">
-                          <a-select-option :value="l.value" :label="l.value" v-for="l in LanguageManager.supportedLanguages">
-                            <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
-                          </a-select-option>
-                        </a-select>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.notifications" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.expireTimeDiff" }}</template>
-                      <template #description>{{ i18n "pages.settings.expireTimeDiffDesc" }}</template>
-                      <template #control>
-                        <a-input-number :min="0" v-model="allSetting.expireDiff" style="width: 100%;"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.trafficDiff" }}</template>
-                      <template #description>{{ i18n "pages.settings.trafficDiffDesc" }}</template>
-                      <template #control>
-                        <a-input-number :min="0" v-model="allSetting.trafficDiff" style="width: 100%;"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.certs" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.publicKeyPath"}}</template>
-                      <template #description>{{ i18n "pages.settings.publicKeyPathDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.webCertFile"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.privateKeyPath"}}</template>
-                      <template #description>{{ i18n "pages.settings.privateKeyPathDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.webKeyFile"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.externalTraffic" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.externalTrafficInformEnable"}}</template>
-                      <template #description>{{ i18n "pages.settings.externalTrafficInformEnableDesc"}}</template>
-                      <template #control>
-                        <a-switch v-model="allSetting.externalTrafficInformEnable"></a-switch>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.externalTrafficInformURI"}}</template>
-                      <template #description>{{ i18n "pages.settings.externalTrafficInformURIDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" placeholder="(http|https)://domain[:port]/path/" v-model="allSetting.externalTrafficInformURI"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.dateAndTime" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.timeZone"}}</template>
-                      <template #description>{{ i18n "pages.settings.timeZoneDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.timeLocation"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.datepicker"}}</template>
-                      <template #description>{{ i18n "pages.settings.datepickerDescription"}}</template>
-                      <template #control>
-                        <a-select style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
-                          <a-select-option v-for="item in datepickerList" :value="item.value">
-                            <span v-text="item.name"></span>
-                          </a-select-option>
-                        </a-select>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                </a-collapse>
+                {{ template "settings/panel/general" . }}
               </a-tab-pane>
               <a-tab-pane key="2" tab='{{ i18n "pages.settings.securitySettings" }}' style="padding-top: 20px;">
-                <a-collapse>
-                  <a-collapse-panel header='{{ i18n "pages.settings.security.admin"}}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.oldUsername"}}</template>
-                      <template #control>
-                        <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.currentPassword"}}</template>
-                      <template #control>
-                        <a-password-input autocomplete="current-password" v-model="user.oldPassword"></a-password-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.newUsername"}}</template>
-                      <template #control>
-                        <a-input v-model="user.newUsername"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.newPassword"}}</template>
-                      <template #control>
-                        <a-password-input autocomplete="new-password" v-model="user.newPassword"></a-password-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-list-item>
-                      <a-space direction="horizontal" style="padding: 0 20px;">
-                        <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
-                      </a-space>
-                    </a-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.security.secret"}}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.security.loginSecurity" }}</template>
-                      <template #description>{{ i18n "pages.settings.security.loginSecurityDesc" }}</template>
-                      <template #control>
-                        <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
-                        <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync" @click="getNewSecret"></a-icon>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.security.secretToken" }}</template>
-                      <template #description>{{ i18n "pages.settings.security.secretTokenDesc" }}</template>
-                      <template #control>
-                        <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
-                      </template>
-                    </a-setting-list-item>
-                    <a-list-item>
-                      <a-space direction="horizontal" style="padding: 0 20px;">
-                        <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">{{ i18n "confirm" }}</a-button>
-                      </a-space>
-                    </a-list-item>
-                  </a-collapse-panel>
-                </a-collapse>
+                {{ template "settings/panel/security" . }}
               </a-tab-pane>
               <a-tab-pane key="3" tab='{{ i18n "pages.settings.TGBotSettings" }}' style="padding-top: 20px;">
-                <a-collapse>
-                  <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramBotEnable" }}</template>
-                      <template #description>{{ i18n "pages.settings.telegramBotEnableDesc" }}</template>
-                      <template #control>
-                        <a-switch v-model="allSetting.tgBotEnable"></a-switch>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramToken"}}</template>
-                      <template #description>{{ i18n "pages.settings.telegramTokenDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.tgBotToken"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramChatId"}}</template>
-                      <template #description>{{ i18n "pages.settings.telegramChatIdDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.tgBotChatId"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramBotLanguage"}}</template>
-                      <template #control>
-                        <a-select ref="selectBotLang" v-model="allSetting.tgLang" :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
-                          <a-select-option :value="l.value" :label="l.value" v-for="l in LanguageManager.supportedLanguages">
-                            <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span v-text="l.name"></span>
-                          </a-select-option>
-                        </a-select>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.notifications" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramNotifyTime"}}</template>
-                      <template #description>{{ i18n "pages.settings.telegramNotifyTimeDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" v-model="allSetting.tgRunTime"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.tgNotifyBackup" }}</template>
-                      <template #description>{{ i18n "pages.settings.tgNotifyBackupDesc" }}</template>
-                      <template #control>
-                        <a-switch v-model="allSetting.tgBotBackup"></a-switch>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.tgNotifyLogin" }}</template>
-                      <template #description>{{ i18n "pages.settings.tgNotifyLoginDesc" }}</template>
-                      <template #control>
-                        <a-switch v-model="allSetting.tgBotLoginNotify"></a-switch>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.tgNotifyCpu" }}</template>
-                      <template #description>{{ i18n "pages.settings.tgNotifyCpuDesc" }}</template>
-                      <template #control>
-                        <a-input-number :min="0" :min="100" v-model="allSetting.tgCpu" style="width: 100%;"></a-switch>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel header='{{ i18n "pages.settings.proxyAndServer" }}'>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramProxy"}}</template>
-                      <template #description>{{ i18n "pages.settings.telegramProxyDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" placeholder="socks5://user:pass@host:port" v-model="allSetting.tgBotProxy"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                    <a-setting-list-item paddings="small">
-                      <template #title>{{ i18n "pages.settings.telegramAPIServer"}}</template>
-                      <template #description>{{ i18n "pages.settings.telegramAPIServerDesc"}}</template>
-                      <template #control>
-                        <a-input type="text" placeholder="https://api.example.com" v-model="allSetting.tgBotAPIServer"></a-input>
-                      </template>
-                    </a-setting-list-item>
-                  </a-collapse-panel>
-                </a-collapse>
+                {{ template "settings/panel/telegram" . }}
               </a-tab-pane>
               <a-tab-pane key="4" tab='{{ i18n "pages.settings.subSettings" }}' style="padding-top: 20px;">
-                <a-collapse>
-                  <a-collapse-panel 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 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 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 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>
+                {{ template "settings/panel/subscription/general" . }}
               </a-tab-pane>
               <a-tab-pane key="5" tab='{{ i18n "pages.settings.subSettings" }} Json' v-if="allSetting.subEnable" style="padding-top: 20px;">
-                <a-collapse>
-                  <a-collapse-panel 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 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 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">
-                                  [[ p ]] </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 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']"> [[ p ]] </a-select-option>
-                              </a-select>
-                            </template>
-                          </a-setting-list-item>
-                        </a-collapse-panel>
-                      </a-collapse>
-                    </a-list-item>
-                  </a-collapse-panel>
-                  <a-collapse-panel 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">[[ p.label ]]</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">[[ p.label ]]</a-select-option>
-                              </a-select>
-                            </template>
-                          </a-setting-list-item>
-                        </a-collapse-panel>
-                      </a-collapse>
-                    </a-list-item>
-                  </a-collapse-panel>
-                </a-collapse>
+                {{ template "settings/panel/subscription/json" . }}
               </a-tab-pane>
             </a-tabs>
           </a-space>
diff --git a/web/html/xui/settings/panel/general.html b/web/html/xui/settings/panel/general.html
new file mode 100644
index 00000000..2f801c49
--- /dev/null
+++ b/web/html/xui/settings/panel/general.html
@@ -0,0 +1,149 @@
+{{define "settings/panel/general"}}
+<a-collapse>
+    <a-collapse-panel header='{{ i18n "pages.xray.generalConfigs"}}'>
+        <a-setting-list-item paddings="small">
+            <template #title>
+                {{ i18n "pages.settings.remarkModel"}}
+            </template>
+            <template #description>
+                {{ i18n "pages.settings.sampleRemark"}}: <i>#[[ remarkSample ]]</i>
+            </template>
+            <template #control>
+                <a-input-group style="width: 100%;">
+                    <a-select style="padding-right: .5rem; min-width: 80%; width: auto;" mode="multiple"
+                        v-model="remarkModel" :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option v-for="(value, key) in remarkModels" :value="key">[[ value ]]</a-select-option>
+                    </a-select>
+                    <a-select style="width: 20%;" v-model="remarkSeparator"
+                        :dropdown-class-name="themeSwitcher.currentTheme">
+                        <a-select-option v-for="key in remarkSeparators" :value="key">[[ key ]]</a-select-option>
+                    </a-select>
+                </a-input-group>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.panelListeningIP"}}</template>
+            <template #description>{{ i18n "pages.settings.panelListeningIPDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.webListen"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.panelListeningDomain"}}</template>
+            <template #description>{{ i18n "pages.settings.panelListeningDomainDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.webDomain"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.panelPort"}}</template>
+            <template #description>{{ i18n "pages.settings.panelPortDesc"}}</template>
+            <template #control>
+                <a-input-number :min="1" :min="65531" v-model="allSetting.webPort" style="width: 100%;"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.panelUrlPath"}}</template>
+            <template #description>{{ i18n "pages.settings.panelUrlPathDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.webBasePath"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.sessionMaxAge" }}</template>
+            <template #description>{{ i18n "pages.settings.sessionMaxAgeDesc" }}</template>
+            <template #control>
+                <a-input-number :min="60" v-model="allSetting.sessionMaxAge" style="width: 100%;"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.pageSize" }}</template>
+            <template #description>{{ i18n "pages.settings.pageSizeDesc" }}</template>
+            <template #control>
+                <a-input-number :min="0" step="5" v-model="allSetting.pageSize" style="width: 100%;"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.language"}}</template>
+            <template #control>
+                <a-select ref="selectLang" v-model="lang" @change="LanguageManager.setLanguage(lang)"
+                    :dropdown-class-name="themeSwitcher.currentTheme" style="width: 100%">
+                    <a-select-option :value="l.value" :label="l.value" v-for="l in LanguageManager.supportedLanguages">
+                        <span role="img" :aria-label="l.name" v-text="l.icon"></span> &nbsp;&nbsp; <span
+                            v-text="l.name"></span>
+                    </a-select-option>
+                </a-select>
+            </template>
+        </a-setting-list-item>
+    </a-collapse-panel>
+    <a-collapse-panel header='{{ i18n "pages.settings.notifications" }}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.expireTimeDiff" }}</template>
+            <template #description>{{ i18n "pages.settings.expireTimeDiffDesc" }}</template>
+            <template #control>
+                <a-input-number :min="0" v-model="allSetting.expireDiff" style="width: 100%;"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.trafficDiff" }}</template>
+            <template #description>{{ i18n "pages.settings.trafficDiffDesc" }}</template>
+            <template #control>
+                <a-input-number :min="0" v-model="allSetting.trafficDiff" style="width: 100%;"></a-input>
+            </template>
+        </a-setting-list-item>
+    </a-collapse-panel>
+    <a-collapse-panel header='{{ i18n "pages.settings.certs" }}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.publicKeyPath"}}</template>
+            <template #description>{{ i18n "pages.settings.publicKeyPathDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.webCertFile"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.privateKeyPath"}}</template>
+            <template #description>{{ i18n "pages.settings.privateKeyPathDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.webKeyFile"></a-input>
+            </template>
+        </a-setting-list-item>
+    </a-collapse-panel>
+    <a-collapse-panel header='{{ i18n "pages.settings.externalTraffic" }}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.externalTrafficInformEnable"}}</template>
+            <template #description>{{ i18n "pages.settings.externalTrafficInformEnableDesc"}}</template>
+            <template #control>
+                <a-switch v-model="allSetting.externalTrafficInformEnable"></a-switch>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.externalTrafficInformURI"}}</template>
+            <template #description>{{ i18n "pages.settings.externalTrafficInformURIDesc"}}</template>
+            <template #control>
+                <a-input type="text" placeholder="(http|https)://domain[:port]/path/"
+                    v-model="allSetting.externalTrafficInformURI"></a-input>
+            </template>
+        </a-setting-list-item>
+    </a-collapse-panel>
+    <a-collapse-panel header='{{ i18n "pages.settings.dateAndTime" }}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.timeZone"}}</template>
+            <template #description>{{ i18n "pages.settings.timeZoneDesc"}}</template>
+            <template #control>
+                <a-input type="text" v-model="allSetting.timeLocation"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.datepicker"}}</template>
+            <template #description>{{ i18n "pages.settings.datepickerDescription"}}</template>
+            <template #control>
+                <a-select style="width: 100%" :dropdown-class-name="themeSwitcher.currentTheme" v-model="datepicker">
+                    <a-select-option v-for="item in datepickerList" :value="item.value">
+                        <span v-text="item.name"></span>
+                    </a-select-option>
+                </a-select>
+            </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/security.html b/web/html/xui/settings/panel/security.html
new file mode 100644
index 00000000..89ff0d96
--- /dev/null
+++ b/web/html/xui/settings/panel/security.html
@@ -0,0 +1,60 @@
+{{define "settings/panel/security"}}
+<a-collapse>
+    <a-collapse-panel header='{{ i18n "pages.settings.security.admin"}}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.oldUsername"}}</template>
+            <template #control>
+                <a-input autocomplete="username" v-model="user.oldUsername"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.currentPassword"}}</template>
+            <template #control>
+                <a-password-input autocomplete="current-password" v-model="user.oldPassword"></a-password-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.newUsername"}}</template>
+            <template #control>
+                <a-input v-model="user.newUsername"></a-input>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.newPassword"}}</template>
+            <template #control>
+                <a-password-input autocomplete="new-password" v-model="user.newPassword"></a-password-input>
+            </template>
+        </a-setting-list-item>
+        <a-list-item>
+            <a-space direction="horizontal" style="padding: 0 20px;">
+                <a-button type="primary" @click="updateUser">{{ i18n "confirm" }}</a-button>
+            </a-space>
+        </a-list-item>
+    </a-collapse-panel>
+    <a-collapse-panel header='{{ i18n "pages.settings.security.secret"}}'>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.security.loginSecurity" }}</template>
+            <template #description>{{ i18n "pages.settings.security.loginSecurityDesc" }}</template>
+            <template #control>
+                <a-switch @change="toggleToken(allSetting.secretEnable)" v-model="allSetting.secretEnable"></a-switch>
+                <a-icon style="margin-left: 1rem;" v-if="allSetting.secretEnable" :spin="this.changeSecret" type="sync"
+                    @click="getNewSecret"></a-icon>
+            </template>
+        </a-setting-list-item>
+        <a-setting-list-item paddings="small">
+            <template #title>{{ i18n "pages.settings.security.secretToken" }}</template>
+            <template #description>{{ i18n "pages.settings.security.secretTokenDesc" }}</template>
+            <template #control>
+                <a-textarea type="text" :disabled="!allSetting.secretEnable" v-model="user.loginSecret"></a-textarea>
+            </template>
+        </a-setting-list-item>
+        <a-list-item>
+            <a-space direction="horizontal" style="padding: 0 20px;">
+                <a-button type="primary" :loading="this.changeSecret" @click="updateSecret">
+                    <span>{{ i18n "confirm"}}</span>
+                </a-button>
+            </a-space>
+        </a-list-item>
+    </a-collapse-panel>
+</a-collapse>
+{{end}}
\ No newline at end of file
diff --git a/web/html/xui/settings/panel/subscription/general.html b/web/html/xui/settings/panel/subscription/general.html
new file mode 100644
index 00000000..bcf6a432
--- /dev/null
+++ b/web/html/xui/settings/panel/subscription/general.html
@@ -0,0 +1,98 @@
+{{define "settings/panel/subscription/general"}}
+<a-collapse>
+    <a-collapse-panel 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 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 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 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
new file mode 100644
index 00000000..48273586
--- /dev/null
+++ b/web/html/xui/settings/panel/subscription/json.html
@@ -0,0 +1,180 @@
+{{define "settings/panel/subscription/json"}}
+<a-collapse>
+    <a-collapse-panel 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 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