From 85d4b8c48791f06d04f16099f166177295aa361d Mon Sep 17 00:00:00 2001 From: Donald Zou Date: Thu, 19 Jun 2025 00:41:08 +0800 Subject: [PATCH] Update --- src/modules/ConnectionString.py | 9 ++- src/modules/DashboardClientsPeerAssignment.py | 1 + src/static/client/src/assets/main.css | 22 +++++++ .../Configuration/configuration.vue | 63 +++++++++++-------- src/static/client/src/views/index.vue | 4 +- 5 files changed, 68 insertions(+), 31 deletions(-) diff --git a/src/modules/ConnectionString.py b/src/modules/ConnectionString.py index 1c9753a..3df56fb 100644 --- a/src/modules/ConnectionString.py +++ b/src/modules/ConnectionString.py @@ -13,6 +13,11 @@ def ConnectionString(database) -> str or None: cn = f'mysql+mysqldb://{parser.get("Database", "username")}:{parser.get("Database", "password")}@{parser.get("Database", "host")}/{database}' else: cn = f'sqlite:///{os.path.join(sqlitePath, f"{database}.db")}' - if not database_exists(cn): - create_database(cn) + try: + if not database_exists(cn): + create_database(cn) + except Exception as e: + print("[WGDashboard] Database error: " + str(e)) + exit(1) + return cn \ No newline at end of file diff --git a/src/modules/DashboardClientsPeerAssignment.py b/src/modules/DashboardClientsPeerAssignment.py index 459f2c1..5e275ea 100644 --- a/src/modules/DashboardClientsPeerAssignment.py +++ b/src/modules/DashboardClientsPeerAssignment.py @@ -85,6 +85,7 @@ class DashboardClientsPeerAssignment: self.wireguardConfigurations[a['ConfigurationName']].Peers) for p in peer: peers.append({ + 'protocol': self.wireguardConfigurations[a['ConfigurationName']].Protocol, 'id': p.id, 'private_key': p.private_key, 'name': p.name, diff --git a/src/static/client/src/assets/main.css b/src/static/client/src/assets/main.css index a712569..01e0007 100644 --- a/src/static/client/src/assets/main.css +++ b/src/static/client/src/assets/main.css @@ -93,6 +93,18 @@ transform: scale(0.97); } +.btn-outline-body{ + color: #000000; + border-color: #000000 !important; + background-color: transparent; +} + +[data-bs-theme=dark] .btn-outline-body{ + color: #ffffff; + border-color: #ffffff !important; + background-color: transparent; +} + .btn-body{ border-color: #000000 !important; color: #ffffff !important; @@ -119,4 +131,14 @@ .form-control{ border-width: 0; +} + +.amneziawgBg{ + background: rgb(145,199,193); + background: linear-gradient(90deg, rgba(145,199,193,1) 0%, rgba(107,95,161,1) 50%, rgba(227,142,65,1) 100%); +} + +.wireguardBg{ + background: rgb(125,32,32); + background: linear-gradient(90deg, rgba(125,32,32,1) 0%, rgba(255,56,56,1) 100%); } \ No newline at end of file diff --git a/src/static/client/src/components/Configuration/configuration.vue b/src/static/client/src/components/Configuration/configuration.vue index 4cae249..6c98968 100644 --- a/src/static/client/src/components/Configuration/configuration.vue +++ b/src/static/client/src/components/Configuration/configuration.vue @@ -12,36 +12,45 @@ const showQRCode = ref(false)