diff --git a/README.md b/README.md
index e803ab5c..552b1eea 100644
--- a/README.md
+++ b/README.md
@@ -352,8 +352,7 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go
# Acknowledgment
- [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 +362,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 9+
# 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/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/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/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 @@
-
+
[[ loading ? '' : '{{ i18n "login" }}' ]]