From bcfa47e2ad116074fa9695275309c03f9ba7ae90 Mon Sep 17 00:00:00 2001 From: Tara Rostami <132676256+TaraRostami@users.noreply.github.com> Date: Thu, 21 Dec 2023 20:38:44 +0330 Subject: [PATCH 01/10] Minor Fixes (#1421) * Update login.html * Update custom.css * Update translate.fa_IR.toml * Update translate.fa_IR.toml * Update translate.en_US.toml --- web/assets/css/custom.css | 4 ++++ web/html/login.html | 5 ++--- web/translation/translate.en_US.toml | 4 ++-- web/translation/translate.fa_IR.toml | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/assets/css/custom.css b/web/assets/css/custom.css index 4ef4b436..ca7d23b1 100644 --- a/web/assets/css/custom.css +++ b/web/assets/css/custom.css @@ -1117,3 +1117,7 @@ li.ant-select-dropdown-menu-item:empty:after { padding: 0.5rem; border-radius: 1rem; } + +.ant-input-group-addon:not(:first-child):not(:last-child), .ant-input-group-wrap:not(:first-child):not(:last-child), .ant-input-group>.ant-input:not(:first-child):not(:last-child) { + border-radius: 0rem 1rem 1rem 0rem; +} diff --git a/web/html/login.html b/web/html/login.html index 3ec9da2e..34eff41c 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -114,6 +114,7 @@ position: relative; border-radius: 25px; width: 100%; + transition: all 0.3s cubic-bezier(.645,.045,.355,1); } .dark .wave-btn-bg { color: #fff; @@ -123,7 +124,6 @@ background-origin: border-box; background-clip: padding-box, border-box; background-size: 300%; - transition: all 0.3s cubic-bezier(.645,.045,.355,1); width: 100%; z-index: 1; } @@ -291,8 +291,7 @@
-
diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 41df2454..7f1b2741 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -59,7 +59,7 @@ "settings" = "Panel Settings" "xray" = "Xray Settings" "logout" = "Logout" -"link" = "Management" +"link" = "Manage" [pages.login] "title" = "Login" @@ -79,7 +79,7 @@ "xrayStatus" = "Status" "stopXray" = "Stop" "restartXray" = "Restart" -"xraySwitch" = "SwitchV" +"xraySwitch" = "Version" "xraySwitchClick" = "Choose the version you want to switch to." "xraySwitchClickDesk" = "Choose wisely, as older versions may not be compatible with current configurations." "operationHours" = "Uptime" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 6597dd51..326c7e79 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -79,7 +79,7 @@ "xrayStatus" = "وضعیت" "stopXray" = "توقف" "restartXray" = "شروع مجدد" -"xraySwitch" = "تغییر ورژن" +"xraySwitch" = "ورژن" "xraySwitchClick" = "ورژن مورد نظر را انتخاب کنید" "xraySwitchClickDesk" = "لطفا با دقت انتخاب کنید ، در صورت انتخاب اشتباه امکان قطعی سیستم وجود دارد " "operationHours" = "آپ تایم سیستم" From 0d2bdde149b467e563807b59da0f42b3c0ebc743 Mon Sep 17 00:00:00 2001 From: Jiraiya <124030777+Jiraiya8@users.noreply.github.com> Date: Fri, 22 Dec 2023 18:39:05 +0800 Subject: [PATCH 02/10] Fix Chinese translation (#1428) Co-authored-by: qingbo --- web/translation/translate.zh_Hans.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index 066e4991..7f5cd1a0 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -10,8 +10,8 @@ "remark" = "备注" "enable" = "启用" "protocol" = "协议" -"search" = "搜尋" -"filter" = "过滤器" +"search" = "搜索" +"filter" = "筛选" "loading" = "加载中..." "second" = "秒" "minute" = "分钟" @@ -30,8 +30,8 @@ "sure" = "确定" "encryption" = "加密" "transmission" = "传输" -"host" = "主持人" -"path" = "小路" +"host" = "Host" +"path" = "Path" "camouflage" = "伪装" "status" = "状态" "enabled" = "开启" @@ -49,8 +49,8 @@ "install" = "安装" "clients" = "客户端" "usage" = "用法" -"secretToken" = "秘密令牌" -"remained" = "仍然存在" +"secretToken" = "安全密钥" +"remained" = "剩余" "security" = "安全" [menu] @@ -148,7 +148,7 @@ "client" = "客户" "export" = "导出链接" "clone" = "克隆" -"cloneInbound" = "创造" +"cloneInbound" = "克隆" "cloneInboundContent" = "此入站的所有项目除 Port、Listening IP、Clients 将应用于克隆" "cloneInboundOk" = "从创建克隆" "resetAllTraffic" = "重置所有入站流量" @@ -377,7 +377,7 @@ "SpotifyWARPDesc" = "为Spotify添加路由到WARP" "IRWARP" = "将伊朗域名路由到 WARP" "IRWARPDesc" = "将伊朗域的路由添加到 WARP。 重启面板生效" -"Inbounds" = "界内" +"Inbounds" = "入站" "InboundsDesc" = "更改配置模板接受特殊客户端" "Outbounds" = "出站" "OutboundsDesc" = "更改配置模板定义此服务器的传出方式" @@ -405,7 +405,7 @@ "editOutbound" = "编辑出站" "editReverse" = "编辑反向" "tag" = "标签" -"tagDesc" = "独特的标签" +"tagDesc" = "唯一标记" "address" = "地址" "reverse" = "反转" "domain" = "域名" From 6a41e19f7ab98b46cbf00a4d9f10395e2113ff1d Mon Sep 17 00:00:00 2001 From: quydang <81231812+quydang04@users.noreply.github.com> Date: Sat, 23 Dec 2023 15:56:56 +0700 Subject: [PATCH 03/10] Update README and added support for AlmaLinux. (#1435) * Update install.sh * Update x-ui.sh * Update install.sh * Update README.md * Update install.sh --- README.md | 4 +++- install.sh | 9 +++++++-- x-ui.sh | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e803ab5c..beed2644 100644 --- a/README.md +++ b/README.md @@ -354,6 +354,7 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go - [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-rules) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ - [Iran Hosted Domains](https://github.com/bootmortis/iran-hosted-domains) (License: **MIT**): _A comprehensive list of Iranian domains and services that are hosted within the country._ - [PersianBlocker](https://github.com/MasterKia/PersianBlocker) (License: **AGPLv3**): _An optimal and extensive list to block ads and trackers on Persian websites._ +- [Vietnam Adblock rules](https://github.com/vuong2023/vn-v2ray-rules) (License: **GPL-3.0**): _A hosted domain hosted in Vietnam and blocklist with the most efficiency for Vietnamese._ # Suggestion System @@ -363,7 +364,8 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go - Fedora 36+ - Arch Linux - Manjaro -- Armbian (for ARM devices) +- Armbian +- AlmaLinux # Pictures diff --git a/install.sh b/install.sh index 8c470cca..3dc2bb61 100644 --- a/install.sh +++ b/install.sh @@ -27,7 +27,7 @@ arch3xui() { case "$(uname -m)" in x86_64 | x64 | amd64) echo 'amd64' ;; armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;; - armv7* | armv7 | arm | arm32 ) echo 'arm32' ;; + armv7* | armv7 | arm | arm32 ) echo 'arm' ;; *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;; esac } @@ -54,6 +54,11 @@ elif [[ "${release}" == "debian" ]]; then if [[ ${os_version} -lt 10 ]]; then echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1 fi + +elif [[ "${release}" == "almalinux" ]]; then + if [[ ${os_version} -lt 9 ]]; then + echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1 + fi elif [[ "${release}" == "arch" ]]; then echo "Your OS is ArchLinux" elif [[ "${release}" == "manjaro" ]]; then @@ -67,7 +72,7 @@ fi install_base() { case "${release}" in - centos|fedora) + centos|fedora|almalinux) yum -y update && yum install -y -q wget curl tar ;; arch|manjaro) diff --git a/x-ui.sh b/x-ui.sh index 144c377a..749e39dd 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -54,6 +54,10 @@ elif [[ "${release}" == "debian" ]]; then if [[ ${os_version} -lt 10 ]]; then echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1 fi +elif [[ "${release}" == "almalinux" ]]; then + if [[ ${os_version} -lt 9 ]]; then + echo -e "${red} Please use Almalinux 9 or higher ${plain}\n" && exit 1 + fi elif [[ "${release}" == "arch" ]]; then echo "Your OS is ArchLinux" elif [[ "${release}" == "manjaro" ]]; then From 9261f9c665fe0a5972df4f534f09f8fa3a52d01b Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Sat, 23 Dec 2023 16:37:09 +0330 Subject: [PATCH 04/10] fix protocol in routing rules modal Co-Authored-By: Alireza Ahmadi --- web/html/xui/xray_rule_modal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/xui/xray_rule_modal.html b/web/html/xui/xray_rule_modal.html index 97e396a5..9ed9e06a 100644 --- a/web/html/xui/xray_rule_modal.html +++ b/web/html/xui/xray_rule_modal.html @@ -36,8 +36,8 @@ - - [[ x ]] + + [[ x ]] From 4f3b93171a5e995edfca0d9a3149f8a35631596a Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Sat, 23 Dec 2023 16:37:32 +0330 Subject: [PATCH 05/10] fix outbound socks/http Co-Authored-By: Alireza Ahmadi --- web/assets/js/model/outbound.js | 16 ++++++++-------- web/html/xui/form/outbound.html | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web/assets/js/model/outbound.js b/web/assets/js/model/outbound.js index 5aad52dd..eb5b8c3b 100644 --- a/web/assets/js/model/outbound.js +++ b/web/assets/js/model/outbound.js @@ -839,12 +839,12 @@ Outbound.ShadowsocksSettings = class extends CommonClass { } }; Outbound.SocksSettings = class extends CommonClass { - constructor(address, port, user, password) { + constructor(address, port, user, pass) { super(); this.address = address; this.port = port; this.user = user; - this.password = password; + this.pass = pass; } static fromJson(json={}) { @@ -854,7 +854,7 @@ Outbound.SocksSettings = class extends CommonClass { servers[0].address, servers[0].port, ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user, - ObjectUtil.isArrEmpty(servers[0].password) ? '' : servers[0].users[0].password, + ObjectUtil.isArrEmpty(servers[0].pass) ? '' : servers[0].users[0].pass, ); } @@ -863,18 +863,18 @@ Outbound.SocksSettings = class extends CommonClass { servers: [{ address: this.address, port: this.port, - users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, password: this.password}], + users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, pass: this.pass}], }], }; } }; Outbound.HttpSettings = class extends CommonClass { - constructor(address, port, user, password) { + constructor(address, port, user, pass) { super(); this.address = address; this.port = port; this.user = user; - this.password = password; + this.pass = pass; } static fromJson(json={}) { @@ -884,7 +884,7 @@ Outbound.HttpSettings = class extends CommonClass { servers[0].address, servers[0].port, ObjectUtil.isArrEmpty(servers[0].users) ? '' : servers[0].users[0].user, - ObjectUtil.isArrEmpty(servers[0].password) ? '' : servers[0].users[0].password, + ObjectUtil.isArrEmpty(servers[0].pass) ? '' : servers[0].users[0].pass, ); } @@ -893,7 +893,7 @@ Outbound.HttpSettings = class extends CommonClass { servers: [{ address: this.address, port: this.port, - users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, password: this.password}], + users: ObjectUtil.isEmpty(this.user) ? [] : [{user: this.user, pass: this.pass}], }], }; } diff --git a/web/html/xui/form/outbound.html b/web/html/xui/form/outbound.html index 7b1caa91..590a1a93 100644 --- a/web/html/xui/form/outbound.html +++ b/web/html/xui/form/outbound.html @@ -94,12 +94,13 @@ - + + + From bbcab768ca5923e9fe9b52e5800a57698ed4ab85 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Sun, 24 Dec 2023 10:50:15 +0330 Subject: [PATCH 10/10] edit languages --- web/translation/translate.es_ES.toml | 6 +++--- web/translation/translate.ru_RU.toml | 6 +++--- web/translation/translate.vi_VN.toml | 12 ++++++------ web/translation/translate.zh_Hans.toml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/translation/translate.es_ES.toml b/web/translation/translate.es_ES.toml index 031d91d2..ed3f7b79 100644 --- a/web/translation/translate.es_ES.toml +++ b/web/translation/translate.es_ES.toml @@ -76,10 +76,10 @@ "title" = "Estado del Sistema" "memory" = "Memoria" "hard" = "Disco Duro" -"xrayStatus" = "Estado de Xray" -"stopXray" = "Detener Xray" +"xrayStatus" = "Estado de" +"stopXray" = "Detener" "restartXray" = "Reiniciar" -"xraySwitch" = "Cambiar Versión" +"xraySwitch" = "Versión" "xraySwitchClick" = "Elige la versión a la que deseas cambiar." "xraySwitchClickDesk" = "Elige sabiamente, ya que las versiones anteriores pueden no ser compatibles con las configuraciones actuales." "operationHours" = "Tiempo de Funcionamiento" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index f6785ef6..228485ac 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -77,9 +77,9 @@ "memory" = "Память" "hard" = "Жесткий диск" "xrayStatus" = "Статус" -"stopXray" = "Остановить Xray" -"restartXray" = "Перезапустить Xray" -"xraySwitch" = "Переключить версию" +"stopXray" = "Остановить" +"restartXray" = "Перезапустить" +"xraySwitch" = "Версия" "xraySwitchClick" = "Выберите желаемую версию" "xraySwitchClickDesk" = "Выбирайте внимательно, так как старые версии могут быть несовместимы с текущими конфигурациями" "operationHours" = "Время работы системы" diff --git a/web/translation/translate.vi_VN.toml b/web/translation/translate.vi_VN.toml index a1ac3e65..9e21af58 100644 --- a/web/translation/translate.vi_VN.toml +++ b/web/translation/translate.vi_VN.toml @@ -74,12 +74,12 @@ [pages.index] "title" = "Trạng thái hệ thống" -"memory" = "Bộ nhớ" -"hard" = "Ổ cứng" -"xrayStatus" = "Trạng thái của Xray" -"stopXray" = "Dừng Xray" -"restartXray" = "Khởi động lại Xray" -"xraySwitch" = "Chuyển đổi phiên bản" +"memory" = "ĐẬP" +"hard" = "Đĩa" +"xrayStatus" = "Trạng thái" +"stopXray" = "Dừng lại" +"restartXray" = "Khởi động lại" +"xraySwitch" = "Phiên bản" "xraySwitchClick" = "Chọn phiên bản mà bạn muốn chuyển đổi sang." "xraySwitchClickDesk" = "Hãy lựa chọn thận trọng, vì các phiên bản cũ có thể không tương thích với các cấu hình hiện tại." "operationHours" = "Thời gian hoạt động" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index ce99dc39..1afe7ead 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -79,7 +79,7 @@ "xrayStatus" = "状态" "stopXray" = "停止" "restartXray" = "重启" -"xraySwitch" = "切换版本" +"xraySwitch" = "版本" "xraySwitchClick" = "点击你想切换的版本" "xraySwitchClickDesk" = "请谨慎选择，旧版本可能配置不兼容" "operationHours" = "系统正常运行时间"