From 14253c35864828458ef3eeecb05591a7ae6e641e Mon Sep 17 00:00:00 2001
From: "Shishkevich D." <135337715+shishkevichd@users.noreply.github.com>
Date: Mon, 24 Mar 2025 09:57:37 +0000
Subject: [PATCH] chore: moving the modals to a separate directory

---
 web/html/xui/inbounds.html                         | 14 +++++++-------
 web/html/xui/{ => modals}/client_bulk_modal.html   |  2 +-
 web/html/xui/{ => modals}/client_modal.html        |  2 +-
 web/html/xui/{ => modals}/dns_modal.html           |  2 +-
 web/html/xui/{ => modals}/fakedns_modal.html       |  2 +-
 web/html/xui/{ => modals}/inbound_info_modal.html  |  2 +-
 web/html/xui/{ => modals}/inbound_modal.html       |  2 +-
 web/html/{common => xui/modals}/prompt_modal.html  |  2 +-
 web/html/{common => xui/modals}/qrcode_modal.html  |  2 +-
 web/html/{common => xui/modals}/text_modal.html    |  2 +-
 web/html/xui/{ => modals}/warp_modal.html          |  2 +-
 web/html/xui/{ => modals}/xray_balancer_modal.html |  2 +-
 web/html/xui/{ => modals}/xray_outbound_modal.html |  2 +-
 web/html/xui/{ => modals}/xray_reverse_modal.html  |  2 +-
 web/html/xui/{ => modals}/xray_rule_modal.html     |  2 +-
 web/html/xui/xray.html                             | 14 +++++++-------
 16 files changed, 28 insertions(+), 28 deletions(-)
 rename web/html/xui/{ => modals}/client_bulk_modal.html (99%)
 rename web/html/xui/{ => modals}/client_modal.html (99%)
 rename web/html/xui/{ => modals}/dns_modal.html (99%)
 rename web/html/xui/{ => modals}/fakedns_modal.html (98%)
 rename web/html/xui/{ => modals}/inbound_info_modal.html (99%)
 rename web/html/xui/{ => modals}/inbound_modal.html (99%)
 rename web/html/{common => xui/modals}/prompt_modal.html (98%)
 rename web/html/{common => xui/modals}/qrcode_modal.html (99%)
 rename web/html/{common => xui/modals}/text_modal.html (98%)
 rename web/html/xui/{ => modals}/warp_modal.html (99%)
 rename web/html/xui/{ => modals}/xray_balancer_modal.html (99%)
 rename web/html/xui/{ => modals}/xray_outbound_modal.html (99%)
 rename web/html/xui/{ => modals}/xray_reverse_modal.html (99%)
 rename web/html/xui/{ => modals}/xray_rule_modal.html (99%)

diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 943334298..fd6ebe8d4 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -1524,12 +1524,12 @@
     });
 </script>
 
-{{template "inboundModal"}}
-{{template "promptModal"}}
-{{template "qrcodeModal"}}
-{{template "textModal"}}
-{{template "inboundInfoModal"}}
-{{template "clientsModal"}}
-{{template "clientsBulkModal"}}
+{{template "modals/inboundModal"}}
+{{template "modals/promptModal"}}
+{{template "modals/qrcodeModal"}}
+{{template "modals/textModal"}}
+{{template "modals/inboundInfoModal"}}
+{{template "modals/clientsModal"}}
+{{template "modals/clientsBulkModal"}}
 </body>
 </html>
diff --git a/web/html/xui/client_bulk_modal.html b/web/html/xui/modals/client_bulk_modal.html
similarity index 99%
rename from web/html/xui/client_bulk_modal.html
rename to web/html/xui/modals/client_bulk_modal.html
index 82e68c742..88e8e645e 100644
--- a/web/html/xui/client_bulk_modal.html
+++ b/web/html/xui/modals/client_bulk_modal.html
@@ -1,4 +1,4 @@
-{{define "clientsBulkModal"}}
+{{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">
diff --git a/web/html/xui/client_modal.html b/web/html/xui/modals/client_modal.html
similarity index 99%
rename from web/html/xui/client_modal.html
rename to web/html/xui/modals/client_modal.html
index aa62e02a7..b6d2a554a 100644
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/modals/client_modal.html
@@ -1,4 +1,4 @@
-{{define "clientsModal"}}
+{{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"
diff --git a/web/html/xui/dns_modal.html b/web/html/xui/modals/dns_modal.html
similarity index 99%
rename from web/html/xui/dns_modal.html
rename to web/html/xui/modals/dns_modal.html
index f61cd8b2e..a1ebaa9f9 100644
--- a/web/html/xui/dns_modal.html
+++ b/web/html/xui/modals/dns_modal.html
@@ -1,4 +1,4 @@
-{{define "dnsModal"}}
+{{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">
diff --git a/web/html/xui/fakedns_modal.html b/web/html/xui/modals/fakedns_modal.html
similarity index 98%
rename from web/html/xui/fakedns_modal.html
rename to web/html/xui/modals/fakedns_modal.html
index 1b4dbe777..8e554ac02 100644
--- a/web/html/xui/fakedns_modal.html
+++ b/web/html/xui/modals/fakedns_modal.html
@@ -1,4 +1,4 @@
-{{define "fakednsModal"}}
+{{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">
diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/modals/inbound_info_modal.html
similarity index 99%
rename from web/html/xui/inbound_info_modal.html
rename to web/html/xui/modals/inbound_info_modal.html
index 5ac5e9abd..50a52190a 100644
--- a/web/html/xui/inbound_info_modal.html
+++ b/web/html/xui/modals/inbound_info_modal.html
@@ -1,4 +1,4 @@
-{{define "inboundInfoModal"}}
+{{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">
diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/modals/inbound_modal.html
similarity index 99%
rename from web/html/xui/inbound_modal.html
rename to web/html/xui/modals/inbound_modal.html
index 4de3518cb..99d182b9f 100644
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/modals/inbound_modal.html
@@ -1,4 +1,4 @@
-{{define "inboundModal"}}
+{{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"
diff --git a/web/html/common/prompt_modal.html b/web/html/xui/modals/prompt_modal.html
similarity index 98%
rename from web/html/common/prompt_modal.html
rename to web/html/xui/modals/prompt_modal.html
index b91ede038..5073650f7 100644
--- a/web/html/common/prompt_modal.html
+++ b/web/html/xui/modals/prompt_modal.html
@@ -1,4 +1,4 @@
-{{define "promptModal"}}
+{{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"
diff --git a/web/html/common/qrcode_modal.html b/web/html/xui/modals/qrcode_modal.html
similarity index 99%
rename from web/html/common/qrcode_modal.html
rename to web/html/xui/modals/qrcode_modal.html
index 93d66fc2a..7046ca9b5 100644
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/xui/modals/qrcode_modal.html
@@ -1,4 +1,4 @@
-{{define "qrcodeModal"}}
+{{define "modals/qrcodeModal"}}
 <a-modal id="qrcode-modal" v-model="qrModal.visible" :title="qrModal.title"
     :dialog-style="DeviceUtils.isMobile() ? { top: '18px' } : {}"
     :closable="true"
diff --git a/web/html/common/text_modal.html b/web/html/xui/modals/text_modal.html
similarity index 98%
rename from web/html/common/text_modal.html
rename to web/html/xui/modals/text_modal.html
index c15282b93..77cb719e7 100644
--- a/web/html/common/text_modal.html
+++ b/web/html/xui/modals/text_modal.html
@@ -1,4 +1,4 @@
-{{define "textModal"}}
+{{define "modals/textModal"}}
 <a-modal id="text-modal" v-model="txtModal.visible" :title="txtModal.title"
          :closable="true"
          :class="themeSwitcher.currentTheme">
diff --git a/web/html/xui/warp_modal.html b/web/html/xui/modals/warp_modal.html
similarity index 99%
rename from web/html/xui/warp_modal.html
rename to web/html/xui/modals/warp_modal.html
index 20ce81398..7fb558474 100644
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/modals/warp_modal.html
@@ -1,4 +1,4 @@
-{{define "warpModal"}}
+{{define "modals/warpModal"}}
 <a-modal id="warp-modal" v-model="warpModal.visible" title="Cloudflare WARP"
          :confirm-loading="warpModal.confirmLoading" :closable="true" :mask-closable="true"
          :footer="null" :class="themeSwitcher.currentTheme">
diff --git a/web/html/xui/xray_balancer_modal.html b/web/html/xui/modals/xray_balancer_modal.html
similarity index 99%
rename from web/html/xui/xray_balancer_modal.html
rename to web/html/xui/modals/xray_balancer_modal.html
index de2a0acb4..fea4019a9 100644
--- a/web/html/xui/xray_balancer_modal.html
+++ b/web/html/xui/modals/xray_balancer_modal.html
@@ -1,4 +1,4 @@
-{{define "balancerModal"}}
+{{define "modals/balancerModal"}}
 <a-modal 
     id="balancer-modal"
     v-model="balancerModal.visible"
diff --git a/web/html/xui/xray_outbound_modal.html b/web/html/xui/modals/xray_outbound_modal.html
similarity index 99%
rename from web/html/xui/xray_outbound_modal.html
rename to web/html/xui/modals/xray_outbound_modal.html
index fd9cf99c4..b3c5d6b1f 100644
--- a/web/html/xui/xray_outbound_modal.html
+++ b/web/html/xui/modals/xray_outbound_modal.html
@@ -1,4 +1,4 @@
-{{define "outModal"}}
+{{define "modals/outModal"}}
 <a-modal id="out-modal" v-model="outModal.visible" :title="outModal.title" @ok="outModal.ok"
          :confirm-loading="outModal.confirmLoading" :closable="true" :mask-closable="false"
          :ok-button-props="{ props: { disabled: !outModal.isValid } }" style="overflow: hidden;"
diff --git a/web/html/xui/xray_reverse_modal.html b/web/html/xui/modals/xray_reverse_modal.html
similarity index 99%
rename from web/html/xui/xray_reverse_modal.html
rename to web/html/xui/modals/xray_reverse_modal.html
index bb1e4bdfe..22f043172 100644
--- a/web/html/xui/xray_reverse_modal.html
+++ b/web/html/xui/modals/xray_reverse_modal.html
@@ -1,4 +1,4 @@
-{{define "reverseModal"}}
+{{define "modals/reverseModal"}}
 <a-modal id="reverse-modal" v-model="reverseModal.visible" :title="reverseModal.title" @ok="reverseModal.ok"
          :confirm-loading="reverseModal.confirmLoading" :closable="true" :mask-closable="false"
          :ok-text="reverseModal.okText" cancel-text='{{ i18n "close" }}' :class="themeSwitcher.currentTheme">
diff --git a/web/html/xui/xray_rule_modal.html b/web/html/xui/modals/xray_rule_modal.html
similarity index 99%
rename from web/html/xui/xray_rule_modal.html
rename to web/html/xui/modals/xray_rule_modal.html
index aba5ba9ea..4be74a8fd 100644
--- a/web/html/xui/xray_rule_modal.html
+++ b/web/html/xui/modals/xray_rule_modal.html
@@ -1,4 +1,4 @@
-{{define "ruleModal"}}
+{{define "modals/ruleModal"}}
 <a-modal id="rule-modal" v-model="ruleModal.visible" :title="ruleModal.title" @ok="ruleModal.ok" :confirm-loading="ruleModal.confirmLoading" :closable="true" :mask-closable="false" :ok-text="ruleModal.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='Domain Matcher'>
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index 077375096..8eb8239a6 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -133,13 +133,13 @@
 {{template "component/aThemeSwitch" .}}
 {{template "component/aTableSortable" .}}
 {{template "component/aSettingListItem" .}}
-{{template "ruleModal"}}
-{{template "outModal"}}
-{{template "reverseModal"}}
-{{template "balancerModal"}}
-{{template "dnsModal"}}
-{{template "fakednsModal"}}
-{{template "warpModal"}}
+{{template "modals/ruleModal"}}
+{{template "modals/outModal"}}
+{{template "modals/reverseModal"}}
+{{template "modals/balancerModal"}}
+{{template "modals/dnsModal"}}
+{{template "modals/fakednsModal"}}
+{{template "modals/warpModal"}}
 <script>
         const rulesColumns = [
         { title: "#", align: 'center', width: 15, scopedSlots: { customRender: 'action' } },