diff --git a/.gitignore b/.gitignore index 781a633d..32f90dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,39 @@ -.idea -.vscode -.cache +# Ignore editor and IDE settings +.idea/ +.vscode/ +.cache/ .sync* -*.tar.gz + +# Ignore log files *.log access.log error.log -tmp -main + +# Ignore temporary files +tmp/ +*.tar.gz + +# Ignore build and distribution directories backup/ bin/ dist/ release/ +node_modules/ + +# Ignore compiled binaries +main + +# Ignore script and executable files /release.sh /x-ui + +# Ignore OS specific files +.DS_Store +Thumbs.db + +# Ignore Go specific files +*.exe +*.exe~ + +# Ignore Docker specific files +docker-compose.override.yml diff --git a/web/html/xui/component/aSidebar.html b/web/html/xui/component/aSidebar.html index 0ddaa176..dfaebb17 100644 --- a/web/html/xui/component/aSidebar.html +++ b/web/html/xui/component/aSidebar.html @@ -45,27 +45,27 @@ return { tabs: [ { - key: '/panel/', + key: 'panel/', icon: 'dashboard', title: '{{ i18n "menu.dashboard"}}' }, { - key: '/panel/inbounds', + key: 'panel/inbounds', icon: 'user', title: '{{ i18n "menu.inbounds"}}' }, { - key: '/panel/settings', + key: 'panel/settings', icon: 'setting', title: '{{ i18n "menu.settings"}}' }, { - key: '/panel/xray', + key: 'panel/xray', icon: 'tool', title: '{{ i18n "menu.xray"}}' }, { - key: '/logout/', + key: 'logout/', icon: 'logout', title: '{{ i18n "menu.logout"}}' }, @@ -79,7 +79,9 @@ }, methods: { openLink(key) { - return key.startsWith('http') ? window.open(key) : location.href = key + return key.startsWith('http') ? + window.open(`{{ .base_path }}${key}`) : + location.href = `{{ .base_path }}${key}` }, closeDrawer() { this.visible = false; diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index d2149784..931bed54 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -635,7 +635,7 @@ "allClients" = "Все клиенты" "addClient" = "Добавить клиента" -"submitDisable" = "Отправить как отключенный ✅" +"submitDisable" = "Отправить отключенным ✅" "use_default" = "🏷️ Использовать по умолчанию" "change_id" = "⚙️🔑 ID" "change_password" = "⚙️🔑 Пароль" diff --git a/web/translation/translate.uk_UA.toml b/web/translation/translate.uk_UA.toml index b7205714..5ee5b8b1 100644 --- a/web/translation/translate.uk_UA.toml +++ b/web/translation/translate.uk_UA.toml @@ -635,7 +635,7 @@ "allClients" = "Всі Клієнти" "addClient" = "Додати клієнта" -"submitDisable" = "Надіслати як вимкнене ✅" +"submitDisable" = "Надіслати відключеним ✅" "use_default" = "🏷️ Використовувати за замовчуванням" "change_id" = "⚙️🔑 ID" "change_password" = "⚙️🔑 Пароль"