From ef0dd10fe761e1cd8db060d6eaaf9b1bee15bc66 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza.ahmadi@tzconnect.com>
Date: Sat, 18 Feb 2023 16:50:40 +0100
Subject: [PATCH] Simplify codes with fix small view problems

---
 web/html/xui/form/protocol/trojan.html | 29 +++++-----------------
 web/html/xui/form/protocol/vless.html  | 34 +++++++-------------------
 web/html/xui/form/protocol/vmess.html  | 29 +++++-----------------
 web/html/xui/inbound_modal.html        | 17 ++-----------
 web/html/xui/inbounds.html             | 17 ++-----------
 5 files changed, 25 insertions(+), 101 deletions(-)

diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index a9421d68..5076d395 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -68,19 +68,10 @@
             </a-tooltip>
             <a-tag color="blue">[[ sizeFormat(getUpStats(trojan.email)) ]] / [[ sizeFormat(getDownStats(trojan.email)) ]]</a-tag>
             <a-tag v-if="trojan._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(trojan.email) + getDownStats(trojan.email)) ]]</a-tag>
-            <a-tag v-show="inbound.settings.trojans.length > 1">
-                <svg
-                    v-show="inbound.settings.trojans.length > 1"
-                    @click="removeClient(index, inbound.settings.trojans)"
-                    xmlns="http://www.w3.org/2000/svg"
-                    viewBox="0 0 24 24"
-                    width="24"
-                    height="24"
-                    class="ml-2 cursor-pointer"
-                    >
+            <a-tag v-show="inbound.settings.vmesses.length > 1" @click="removeClient(index, inbound.settings.vmesses)">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
                     <path fill="none" d="M0 0h24v24H0z" />
-                    <path
-                    fill="#EC4899"
+                    <path fill="#EC4899"
                     d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
                     />
                 </svg>
@@ -88,18 +79,10 @@
         </a-form>
     </a-collapse-panel>
 </a-collapse>
-<a-tag>
-    <svg
-        @click="addClient(inbound.protocol, inbound.settings.trojans)"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        width="24"
-        height="24"
-        class="ml-2 cursor-pointer"
-        >
+<a-tag @click="addClient(inbound.protocol, inbound.settings.vmesses)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
         <path fill="none" d="M0 0h24v24H0z" />
-        <path
-        fill="green"
+        <path fill="green"
         d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
         />
     </svg>
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index 88ab97f0..86f6a063 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -70,37 +70,21 @@
             <a-tag color="blue">[[ sizeFormat(getUpStats(vless.email)) ]] / [[ sizeFormat(getDownStats(vless.email)) ]]</a-tag>
             <a-tag v-if="vless._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(vless.email) + getDownStats(vless.email)) ]]</a-tag>
 
-            <a-tag v-show="inbound.settings.vlesses.length > 1">
-                <svg
-                @click="removeClient(index, inbound.settings.vlesses)"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 22 22"
-                width="22"
-                height="22"
-                class="mt-2 cursor-pointer"
-                >
-                <path fill="none" d="M0 0h24v24H0z" />
-                <path
-                fill="#EC4899"
-                d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
-                />
+            <a-tag v-show="inbound.settings.vmesses.length > 1" @click="removeClient(index, inbound.settings.vmesses)">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
+                    <path fill="none" d="M0 0h24v24H0z" />
+                    <path fill="#EC4899"
+                    d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
+                    />
                 </svg>
             </a-tag>
         </a-form>
     </a-collapse-panel>
 </a-collapse>
-<a-tag>
-    <svg
-        @click="addClient(inbound.protocol, inbound.settings.vlesses)"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        width="24"
-        height="24"
-        class="ml-2 cursor-pointer"
-        >
+<a-tag @click="addClient(inbound.protocol, inbound.settings.vmesses)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
         <path fill="none" d="M0 0h24v24H0z" />
-        <path
-        fill="green"
+        <path fill="green"
         d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
         />
     </svg>
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 3b1bf26e..bd46f009 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -65,19 +65,10 @@
             </a-tooltip>
             <a-tag color="blue">[[ sizeFormat(getUpStats(vmess.email)) ]] / [[ sizeFormat(getDownStats(vmess.email)) ]]</a-tag>
             <a-tag v-if="vmess._totalGB > 0" color="red">used : [[ sizeFormat(getUpStats(vmess.email) + getDownStats(vmess.email)) ]]</a-tag>
-                <a-tag v-show="inbound.settings.vmesses.length > 1">
-                    <!--Remove Svg Icon-->
-                    <svg
-                        @click="removeClient(index, inbound.settings.vmesses)"
-                        xmlns="http://www.w3.org/2000/svg"
-                        viewBox="0 0 22 22"
-                        width="22"
-                        height="22"
-                        class="mt-2 cursor-pointer"
-                        >
+                <a-tag v-show="inbound.settings.vmesses.length > 1" @click="removeClient(index, inbound.settings.vmesses)">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width="22" height="22" class="mt-2 cursor-pointer">
                         <path fill="none" d="M0 0h24v24H0z" />
-                        <path
-                        fill="#EC4899"
+                        <path fill="#EC4899"
                         d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9.414l2.828-2.829 1.415 1.415L13.414 12l2.829 2.828-1.415 1.415L12 13.414l-2.828 2.829-1.415-1.415L10.586 12 7.757 9.172l1.415-1.415L12 10.586z"
                         />
                     </svg>
@@ -89,18 +80,10 @@
 
 </a-collapse>
 
-<a-tag>
-    <svg
-        @click="addClient(inbound.protocol, inbound.settings.vmesses)"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        width="24"
-        height="24"
-        class="ml-2 cursor-pointer"
-        >
+<a-tag @click="addClient(inbound.protocol, inbound.settings.vmesses)">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="ml-2 cursor-pointer">
         <path fill="none" d="M0 0h24v24H0z" />
-        <path
-        fill="green"
+        <path fill="green"
         d="M11 11V7h2v4h4v2h-4v4h-2v-4H7v-2h4zm1 11C6.477 22 2 17.523 2 12S6.477 2 12 2s10 4.477 10 10-4.477 10-10 10zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16z"
         />
     </svg>
diff --git a/web/html/xui/inbound_modal.html b/web/html/xui/inbound_modal.html
index 798fc369..fdd1328f 100644
--- a/web/html/xui/inbound_modal.html
+++ b/web/html/xui/inbound_modal.html
@@ -121,7 +121,6 @@
                         }
                     }
                 }
-
             },
             getDownStats(email) {
                 clientStats = this.inbound.clientStats
@@ -137,30 +136,18 @@
                 }
             },
             isClientEnable(email) {
-                clientStats = this.inbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['enable']
-
-                        }
-                    }
-                }
+                clientStats = this.dbInbound.clientStats ? this.dbInbound.clientStats.find(stats => stats.email === email) : null
+                return clientStats ? clientStats['enable'] : true
             },
-
             getHeaderText(email) {
                 if(email == "")
                     return "Add Client"
                 
                 return email + (this.isClientEnable(email) == true ? ' Active' : ' Deactive')
             },
-
             getHeaderStyle(email) {
                 return (this.isClientEnable(email) == true ? '' : 'deactive-client')
             },
-            
             getNewEmail(client) {
                 var chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
                 var string = '';
diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html
index 8b251202..1b3c62e0 100644
--- a/web/html/xui/inbounds.html
+++ b/web/html/xui/inbounds.html
@@ -447,7 +447,6 @@
                         }
                     }
                 }
-
             },
             getDownStats(dbInbound, email) {
                 clientStats = dbInbound.clientStats
@@ -476,20 +475,8 @@
                 }
             },
             isClientEnabled(dbInbound, email) {
-                clientStats = dbInbound.clientStats
-                if(clientStats.length > 0)
-                {
-                    for (const key in clientStats) {
-                        if (Object.hasOwnProperty.call(clientStats, key)) {
-                            if(clientStats[key]['email'] == email)
-                                return clientStats[key]['enable']
-
-                        }
-                    }
-                }
-                else{
-                    return true
-                }
+                clientStats = dbInbound.clientStats ? dbInbound.clientStats.find(stats => stats.email === email) : null
+                return clientStats ? clientStats['enable'] : true
             },
         },
         watch: {