From a9a0eea61d0bb15bc5ec8980850252c086cd19da Mon Sep 17 00:00:00 2001 From: orohi Date: Sun, 26 Jul 2026 09:00:09 +0300 Subject: [PATCH] v1.7.0: pick server first, then protocol in create flows. Co-authored-by: Cursor --- README.md | 5 ++ app.py | 2 +- templates/invites.html | 142 ++++++++++++++++++++++++++++++++-------- templates/settings.html | 105 ++++++++++++++++++++++++----- templates/users.html | 78 ++++++++++++++++------ translations/en.json | 1 + translations/ru.json | 1 + 7 files changed, 266 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index f1cda49..cdcf386 100644 --- a/README.md +++ b/README.md @@ -219,6 +219,11 @@ GitHub Actions workflows in `.github/workflows/`: ## 📋 Fix / changelog (this fork) +### v1.7.0 +* **Clearer create flow**: pick **server first**, then **protocol** (WireGuard, AmneziaWG 2.0, …) — invites, guest access, and user connections no longer dump everything into one messy list. +* Protocol titles are human-readable and ordered (AWG 2.0 → AWG → Legacy → WireGuard → Xray → Telemt). +* 3x-ui is a separate “server” choice; VLESS inbounds still load from that panel’s API. + ### v1.6.0 * **3x-ui multi-panel**: register several 3x-ui servers in Settings; pick a panel and load VLESS inbounds over its API when creating users/invites (share link comes from 3x-ui). * **Docker / CI**: refreshed `Dockerfile` + compose, `.env.example`, CI checks, GHCR image workflow. diff --git a/app.py b/app.py index 1c43a14..c5b2f5c 100644 --- a/app.py +++ b/app.py @@ -101,7 +101,7 @@ else: application_path = os.path.dirname(__file__) DATA_FILE = os.path.join(application_path, 'data.json') # legacy JSON; used only for one-shot import / export -CURRENT_VERSION = "v1.6.0" +CURRENT_VERSION = "v1.7.0" RELEASES_REPO_URL = "https://git.evilfox.cc/test2/Amnezia-Web-Panel-main" RELEASES_API_LATEST = "https://git.evilfox.cc/api/v1/repos/test2/Amnezia-Web-Panel-main/releases/latest" BIN_DIR = os.environ.get('TUNNEL_BIN_DIR', os.path.join(application_path, 'bin')) diff --git a/templates/invites.html b/templates/invites.html index eca1cfd..7fd5598 100644 --- a/templates/invites.html +++ b/templates/invites.html @@ -127,17 +127,22 @@
+ + +
{{ _('server_then_protocol_hint') }}
+
+ +
@@ -187,9 +192,28 @@