From 2a2024375118c079839c59fa73da7b91143b6b22 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Tue, 16 Jan 2024 00:47:21 +0330
Subject: [PATCH] v2.1.0

---
 README.md                    |  6 +++---
 config/version               |  2 +-
 web/html/xui/warp_modal.html | 10 +++++-----
 web/html/xui/xray.html       |  5 +----
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 9ecf147e..96952794 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 ## Install Custom Version
 
-To install your desired version, add the version to the end of the installation command. e.g., ver `v2.0.2`:
+To install your desired version, add the version to the end of the installation command. e.g., ver `v2.1.0`:
 
 ```
-bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.0.2
+bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v2.1.0
 ```
 ## Manual Install & Upgrade
 
@@ -135,7 +135,7 @@ systemctl restart x-ui
 - Search within all inbounds and clients
 - Dark/Light theme
 - Supports multi-user and multi-protocol
-- Supports protocols, including VMess, VLESS, Trojan, Shadowsocks, Dokodemo-door, Socks, HTTP
+- Supports protocols, including VMess, VLESS, Trojan, Shadowsocks, Dokodemo-door, Socks, HTTP, wireguard
 - Supports XTLS native Protocols, including RPRX-Direct, Vision, REALITY
 - Traffic statistics, traffic limit, expiration time limit
 - Customizable Xray configuration templates
diff --git a/config/version b/config/version
index f93ea0ca..50aea0e7 100644
--- a/config/version
+++ b/config/version
@@ -1 +1 @@
-2.0.2
\ No newline at end of file
+2.1.0
\ No newline at end of file
diff --git a/web/html/xui/warp_modal.html b/web/html/xui/warp_modal.html
index c9f86603..d1663df0 100644
--- a/web/html/xui/warp_modal.html
+++ b/web/html/xui/warp_modal.html
@@ -76,7 +76,7 @@
             </table>
             <a-divider style="margin: 10px 0;">WARP {{ i18n "pages.xray.rules.outbound" }}</a-divider>
             <a-form :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
-                <a-form-item label="{{ i18n "status" }}">
+                <a-form-item label='{{ i18n "status" }}'>
                     <template v-if="warpOutboundIndex>=0">
                         <a-tag color="green">{{ i18n "enabled" }}</a-tag>
                         <a-button @click="resetOutbound" :loading="warpModal.confirmLoading">{{ i18n "reset" }}</a-button>
@@ -113,7 +113,7 @@
         },
         async getData(){
             this.loading(true);
-            const msg = await HttpUtil.post('/xui/xray/warp/data');
+            const msg = await HttpUtil.post('/panel/xray/warp/data');
             this.loading(false);
             if (msg.success) {
                 this.warpData = msg.obj.length>0 ? JSON.parse(msg.obj): null;
@@ -152,7 +152,7 @@
             async register(){
                 warpModal.loading(true);
                 keys = Wireguard.generateKeypair();
-                const msg = await HttpUtil.post('/xui/xray/warp/reg',keys);
+                const msg = await HttpUtil.post('/panel/xray/warp/reg',keys);
                 if (msg.success) {
                     resp = JSON.parse(msg.obj);
                     warpModal.warpData = resp.data;
@@ -163,7 +163,7 @@
             },
             async updateLicense(l){
                 warpModal.loading(true);
-                const msg = await HttpUtil.post('/xui/xray/warp/license',{license: l});
+                const msg = await HttpUtil.post('/panel/xray/warp/license',{license: l});
                 if (msg.success) {
                     warpModal.warpData = JSON.parse(msg.obj);
                     warpModal.warpConfig = null;
@@ -173,7 +173,7 @@
             },
             async getConfig(){
                 warpModal.loading(true);
-                const msg = await HttpUtil.post('/xui/xray/warp/config');
+                const msg = await HttpUtil.post('/panel/xray/warp/config');
                 warpModal.loading(false);
                 if (msg.success) {
                     warpModal.warpConfig = JSON.parse(msg.obj);
diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html
index ff9eb2a9..54d40993 100644
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@@ -228,6 +228,7 @@
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.NetflixWARP"}}' desc='{{ i18n "pages.xray.NetflixWARPDesc"}}' v-model="NetflixWARPSettings"></setting-list-item>
                                     <setting-list-item type="switch" title='{{ i18n "pages.xray.SpotifyWARP"}}' desc='{{ i18n "pages.xray.SpotifyWARPDesc"}}' v-model="SpotifyWARPSettings"></setting-list-item>
                                 </template>
+                                <a-button v-else style="margin: 10px 0;" @click="showWarp">WARP {{ i18n "pages.xray.rules.outbound" }}</a-button>
                                 </a-collapse-panel>
                             </a-collapse>
                         </a-tab-pane>
@@ -1141,10 +1142,6 @@
                 get: function () { return JSON.stringify(this.ipv4Domains, null, 2); },
                 set: debounce(function (value) { this.ipv4Domains = JSON.parse(value); }, 1000)
             },
-            manualWARPDomains: {
-                get: function () { return JSON.stringify(this.warpDomains, null, 2); },
-                set: debounce(function (value) { this.warpDomains = JSON.parse(value); }, 1000)
-            },
             torrentSettings: {
                 get: function () {
                     return doAllItemsExist(this.settingsData.protocols.bittorrent, this.blockedProtocols);