From b37f85edea129a39e6eb759350ae1d6881ca1e22 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Tue, 12 Mar 2024 18:46:50 +0100 Subject: [PATCH 01/11] [update] package.json and changelog to current release 12 Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> --- docs/changelog.json | 3 ++- src/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog.json b/docs/changelog.json index fe4431f..ac5208a 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -9,5 +9,6 @@ "8": "Updated to Node.js v18.", "9": "Fixed issue running on devices with older kernels.", "10": "Added sessionless HTTP API auth & automatic dark mode.", - "11": "Multilanguage Support & various bugfixes" + "11": "Multilanguage Support & various bugfixes", + "12": "UI_TRAFFIC_STATS, Import json configurations with no PreShared-Key, allow clients with no privateKey & more." } diff --git a/src/package.json b/src/package.json index 14cf518..c3861f9 100644 --- a/src/package.json +++ b/src/package.json @@ -1,5 +1,5 @@ { - "release": "11", + "release": "12", "name": "wg-easy", "version": "1.0.1", "description": "The easiest way to run WireGuard VPN + Web-based Admin UI.", From 6c4eb522a6c76c8d9f492547cd93f01c4bf8155b Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Thu, 14 Mar 2024 09:37:50 +0100 Subject: [PATCH 02/11] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9581044..ef9260b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ You have found the easiest way to install & manage WireGuard on any Linux host!

## Features - * All-in-one: WireGuard + Web UI. * Easy installation, simple to use. * List, create, edit, delete, enable & disable clients. @@ -23,6 +22,8 @@ You have found the easiest way to install & manage WireGuard on any Linux host! * Tx/Rx charts for each connected client. * Gravatar support. * Automatic Light / Dark Mode +* Multilanguage Support +* UI_TRAFFIC_STATS (default off) ## Requirements From dbbfdd5357c991e99a27dfd5002114dce1303d91 Mon Sep 17 00:00:00 2001 From: Utkarsh Goel Date: Wed, 27 Mar 2024 21:24:15 +0800 Subject: [PATCH 03/11] Add backward compatibility for WG_DEFAULT_ADDRESS --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 35cb266..27aabae 100644 --- a/src/config.js +++ b/src/config.js @@ -14,7 +14,7 @@ module.exports.WG_HOST = process.env.WG_HOST; module.exports.WG_PORT = process.env.WG_PORT || '51820'; module.exports.WG_MTU = process.env.WG_MTU || null; module.exports.WG_PERSISTENT_KEEPALIVE = process.env.WG_PERSISTENT_KEEPALIVE || '0'; -module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS || '10.8.0.0'; +module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS.replace('x', '0') || '10.8.0.0'; module.exports.WG_DEFAULT_ADDRESS_RANGE = process.env.WG_DEFAULT_ADDRESS_RANGE || '24'; module.exports.WG_DEFAULT_DNS = typeof process.env.WG_DEFAULT_DNS === 'string' ? process.env.WG_DEFAULT_DNS From 33634211a937ee01584be998d2409f8c673df71c Mon Sep 17 00:00:00 2001 From: Utkarsh Goel Date: Wed, 27 Mar 2024 22:18:37 +0800 Subject: [PATCH 04/11] check for empty WG_DEFAULT_ADDRESS --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 27aabae..6c0107e 100644 --- a/src/config.js +++ b/src/config.js @@ -14,7 +14,7 @@ module.exports.WG_HOST = process.env.WG_HOST; module.exports.WG_PORT = process.env.WG_PORT || '51820'; module.exports.WG_MTU = process.env.WG_MTU || null; module.exports.WG_PERSISTENT_KEEPALIVE = process.env.WG_PERSISTENT_KEEPALIVE || '0'; -module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS.replace('x', '0') || '10.8.0.0'; +module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS && process.env.WG_DEFAULT_ADDRESS.replace('x', '0') || '10.8.0.0'; module.exports.WG_DEFAULT_ADDRESS_RANGE = process.env.WG_DEFAULT_ADDRESS_RANGE || '24'; module.exports.WG_DEFAULT_DNS = typeof process.env.WG_DEFAULT_DNS === 'string' ? process.env.WG_DEFAULT_DNS From 4981b72d00d224d32e75de19a6cfc7c2267b7fab Mon Sep 17 00:00:00 2001 From: Utkarsh Goel Date: Wed, 27 Mar 2024 22:23:37 +0800 Subject: [PATCH 05/11] fix unambiguous boolean operators --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 6c0107e..c50b7cf 100644 --- a/src/config.js +++ b/src/config.js @@ -14,7 +14,7 @@ module.exports.WG_HOST = process.env.WG_HOST; module.exports.WG_PORT = process.env.WG_PORT || '51820'; module.exports.WG_MTU = process.env.WG_MTU || null; module.exports.WG_PERSISTENT_KEEPALIVE = process.env.WG_PERSISTENT_KEEPALIVE || '0'; -module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS && process.env.WG_DEFAULT_ADDRESS.replace('x', '0') || '10.8.0.0'; +module.exports.WG_DEFAULT_ADDRESS = (process.env.WG_DEFAULT_ADDRESS && process.env.WG_DEFAULT_ADDRESS.replace('x', '0')) || '10.8.0.0'; module.exports.WG_DEFAULT_ADDRESS_RANGE = process.env.WG_DEFAULT_ADDRESS_RANGE || '24'; module.exports.WG_DEFAULT_DNS = typeof process.env.WG_DEFAULT_DNS === 'string' ? process.env.WG_DEFAULT_DNS From 074b3548d29cac61b8d74503032c51d893faf606 Mon Sep 17 00:00:00 2001 From: NPM Update Bot Date: Sun, 31 Mar 2024 17:37:34 +0000 Subject: [PATCH 06/11] npm: package updates --- src/package-lock.json | 46 +++++++++++++++++++++---------------------- src/package.json | 2 +- src/www/css/app.css | 18 +++++++++++++---- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 7ac2475..75b9dfd 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -19,7 +19,7 @@ }, "devDependencies": { "eslint-config-athom": "^3.1.3", - "tailwindcss": "^3.4.1" + "tailwindcss": "^3.4.3" }, "engines": { "node": "18" @@ -1145,9 +1145,9 @@ } }, "node_modules/cookie-es": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.0.0.tgz", - "integrity": "sha512-mWYvfOLrfEc996hlKcdABeIiPHUPC6DM2QYZdGGOvhOTbA3tjm2eBwqlJpoFdjC89NI4Qt6h0Pu06Mp+1Pj5OQ==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.1.0.tgz", + "integrity": "sha512-L2rLOcK0wzWSfSDA33YR+PUHDG10a8px7rUHKWbGLP4YfbsMed2KFUw5fczvDPbT98DDe3LEzviswl810apTEw==" }, "node_modules/cookie-signature": { "version": "1.0.7", @@ -1400,9 +1400,9 @@ } }, "node_modules/es-abstract": { - "version": "1.23.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.2.tgz", - "integrity": "sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==", + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.1", @@ -1444,11 +1444,11 @@ "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.7", + "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.2", "typed-array-byte-length": "^1.0.1", "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.5", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.15" }, @@ -3466,12 +3466,12 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", "dev": true, "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", + "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { @@ -4288,16 +4288,16 @@ } }, "node_modules/sucrase/node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", + "jackspeak": "^2.3.6", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -4376,9 +4376,9 @@ "peer": true }, "node_modules/tailwindcss": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz", - "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz", + "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -4389,7 +4389,7 @@ "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.19.1", + "jiti": "^1.21.0", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", diff --git a/src/package.json b/src/package.json index 47f9b59..2116179 100644 --- a/src/package.json +++ b/src/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "eslint-config-athom": "^3.1.3", - "tailwindcss": "^3.4.1" + "tailwindcss": "^3.4.3" }, "nodemonConfig": { "ignore": [ diff --git a/src/www/css/app.css b/src/www/css/app.css index 1db1aa0..8427047 100644 --- a/src/www/css/app.css +++ b/src/www/css/app.css @@ -1,5 +1,5 @@ /* -! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com +! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com */ /* @@ -211,6 +211,8 @@ textarea { /* 1 */ line-height: inherit; /* 1 */ + letter-spacing: inherit; + /* 1 */ color: inherit; /* 1 */ margin: 0; @@ -234,9 +236,9 @@ select { */ button, -[type='button'], -[type='reset'], -[type='submit'] { +input:where([type='button']), +input:where([type='reset']), +input:where([type='submit']) { -webkit-appearance: button; /* 1 */ background-color: transparent; @@ -492,6 +494,10 @@ video { --tw-backdrop-opacity: ; --tw-backdrop-saturate: ; --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; } ::backdrop { @@ -542,6 +548,10 @@ video { --tw-backdrop-opacity: ; --tw-backdrop-saturate: ; --tw-backdrop-sepia: ; + --tw-contain-size: ; + --tw-contain-layout: ; + --tw-contain-paint: ; + --tw-contain-style: ; } .container { From 61b57a885cfe10124c3ab057b6ec05366509f023 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:04:29 +0200 Subject: [PATCH 07/11] README.md: make commands easier to copy --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index edd569b..170f4de 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,8 @@ And log in again. To automatically install & run wg-easy, simply run: -
-$ docker run -d \
-  --name=wg-easy \
+```
+  docker run -d \  --name=wg-easy \
   -e LANG=de \
   -e WG_HOST=🚨YOUR_SERVER_IP \
   -e PASSWORD=🚨YOUR_ADMIN_PASSWORD \
@@ -64,7 +63,7 @@ $ docker run -d \
   --sysctl="net.ipv4.ip_forward=1" \
   --restart unless-stopped \
   ghcr.io/wg-easy/wg-easy
-
+``` > 💡 Replace `YOUR_SERVER_IP` with your WAN IP, or a Dynamic DNS hostname. > From 4868f32f1e6d7f440a1768a4923aa1f9692d5e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Le=C3=B3n?= Date: Mon, 1 Apr 2024 23:16:57 +0200 Subject: [PATCH 08/11] i18n.js: complete words in Spanish --- src/www/js/i18n.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/www/js/i18n.js b/src/www/js/i18n.js index c976a20..41d339e 100644 --- a/src/www/js/i18n.js +++ b/src/www/js/i18n.js @@ -275,6 +275,8 @@ const messages = { // eslint-disable-line no-unused-vars downloadConfig: 'Descargar configuración', madeBy: 'Hecho por', donate: 'Donar', + toggleCharts: 'Mostrar/Ocultar gráficos', + theme: { dark: 'Modo oscuro', light: 'Modo claro', auto: 'Modo automático' }, }, ko: { name: '이름', From 990a7ae5488949657e786ad41cd528316a6082ef Mon Sep 17 00:00:00 2001 From: Michael van Tricht Date: Wed, 3 Apr 2024 12:31:02 +0200 Subject: [PATCH 09/11] Fix comment in docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a0075d6..aa22fae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt # - UI_TRAFFIC_STATS=true - # - UI_CHART_TYPE=0 (0 # Charts disabled, 1 # Line chart, 2 # Area chart, 3 # Bar chart) + # - UI_CHART_TYPE=0 # (0 Charts disabled, 1 # Line chart, 2 # Area chart, 3 # Bar chart) image: ghcr.io/wg-easy/wg-easy container_name: wg-easy From 9e925c2ebb2eb7a63781386c37f50a2ff23cbb69 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:59:41 +0200 Subject: [PATCH 10/11] [prepare] version bump to 13 and updated changelog Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> --- docs/changelog.json | 5 +++-- src/package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/changelog.json b/docs/changelog.json index ac5208a..c783797 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -9,6 +9,7 @@ "8": "Updated to Node.js v18.", "9": "Fixed issue running on devices with older kernels.", "10": "Added sessionless HTTP API auth & automatic dark mode.", - "11": "Multilanguage Support & various bugfixes", - "12": "UI_TRAFFIC_STATS, Import json configurations with no PreShared-Key, allow clients with no privateKey & more." + "11": "Multilanguage Support & various bugfixes.", + "12": "UI_TRAFFIC_STATS, Import json configurations with no PreShared-Key, allow clients with no privateKey & more.", + "13": "new framework (h3), UI_CHART_TYPE, some bugfixes and more" } diff --git a/src/package.json b/src/package.json index 2116179..36b3cc5 100644 --- a/src/package.json +++ b/src/package.json @@ -1,5 +1,5 @@ { - "release": "12", + "release": "13", "name": "wg-easy", "version": "1.0.1", "description": "The easiest way to run WireGuard VPN + Web-based Admin UI.", From 9507454d3f8e24baffec1a0cf9a0f8bc03077273 Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Fri, 5 Apr 2024 19:02:15 +0200 Subject: [PATCH 11/11] [fixup] Grammar Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> --- docs/changelog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.json b/docs/changelog.json index c783797..1f16d86 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -11,5 +11,5 @@ "10": "Added sessionless HTTP API auth & automatic dark mode.", "11": "Multilanguage Support & various bugfixes.", "12": "UI_TRAFFIC_STATS, Import json configurations with no PreShared-Key, allow clients with no privateKey & more.", - "13": "new framework (h3), UI_CHART_TYPE, some bugfixes and more" + "13": "New framework (h3), UI_CHART_TYPE, some bugfixes and more." }