From b46018efd8dfc3ed1bdfb1324f6dec067e8a2dab Mon Sep 17 00:00:00 2001 From: tetuaoro <65575727+tetuaoro@users.noreply.github.com> Date: Mon, 22 Jul 2024 12:44:53 +0200 Subject: [PATCH 1/6] fix: buttons on mobile --- How_to_generate_an_bcrypt_hash.md | 12 +++------ package.json | 9 +++++-- src/config.js | 4 +-- src/package.json | 4 ++- src/www/css/app.css | 41 +++++++++++++++++++++++++++++++ src/www/index.html | 20 +++++++-------- 6 files changed, 66 insertions(+), 24 deletions(-) diff --git a/How_to_generate_an_bcrypt_hash.md b/How_to_generate_an_bcrypt_hash.md index 61df3d99..88df7b94 100644 --- a/How_to_generate_an_bcrypt_hash.md +++ b/How_to_generate_an_bcrypt_hash.md @@ -9,16 +9,14 @@ ## Usage with Docker -To generate a bcrypt password hash using Docker, run the following command: +To generate a bcrypt password hash using docker, run the following command : ```sh docker run ghcr.io/wg-easy/wg-easy wgpw YOUR_PASSWORD PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // litteraly YOUR_PASSWORD ``` -## Important - -Make sure to enclose your password in single quotes when you run a linux host. +*Important* : make sure to enclose your password in single quotes when you run `docker run` command : ```bash $ echo $2b$12$coPqCsPtcF @@ -27,8 +25,4 @@ $ echo "$2b$12$coPqCsPtcF" b2 $ echo '$2b$12$coPqCsPtcF' $2b$12$coPqCsPtcF -``` - -## LICENSE - -[wg-easy license](./LICENSE) +``` \ No newline at end of file diff --git a/package.json b/package.json index c0485821..e3f6e86c 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,13 @@ { "version": "1.0.1", "scripts": { + "sudobuild": "DOCKER_BUILDKIT=1 sudo docker build --tag wg-easy .", "build": "DOCKER_BUILDKIT=1 docker build --tag wg-easy .", "serve": "docker compose -f docker-compose.yml -f docker-compose.dev.yml up", + "sudostart": "sudo docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy", "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" - } -} + }, + "workspaces": [ + "src" + ] +} \ No newline at end of file diff --git a/src/config.js b/src/config.js index ac4b407a..97850537 100644 --- a/src/config.js +++ b/src/config.js @@ -1,8 +1,8 @@ 'use strict'; -const { release } = require('./package.json'); +const { release: { version } } = require('./package.json'); -module.exports.RELEASE = release; +module.exports.RELEASE = version; module.exports.PORT = process.env.PORT || '51821'; module.exports.WEBUI_HOST = process.env.WEBUI_HOST || '0.0.0.0'; module.exports.PASSWORD_HASH = process.env.PASSWORD_HASH; diff --git a/src/package.json b/src/package.json index 63836481..5fe89816 100644 --- a/src/package.json +++ b/src/package.json @@ -1,5 +1,7 @@ { - "release": "13", + "release": { + "version": "13" + }, "name": "wg-easy", "version": "1.0.1", "description": "The easiest way to run WireGuard VPN + Web-based Admin UI.", diff --git a/src/www/css/app.css b/src/www/css/app.css index acb974f1..58bb8441 100644 --- a/src/www/css/app.css +++ b/src/www/css/app.css @@ -1034,6 +1034,16 @@ video { border-radius: 0.375rem; } +.rounded-l-full { + border-top-left-radius: 9999px; + border-bottom-left-radius: 9999px; +} + +.rounded-r-full { + border-top-right-radius: 9999px; + border-bottom-right-radius: 9999px; +} + .border { border-width: 1px; } @@ -1522,6 +1532,21 @@ video { fill: #4b5563; } +@media not all and (min-width: 768px) { + .max-md\:border-x-0 { + border-left-width: 0px; + border-right-width: 0px; + } + + .max-md\:border-l-0 { + border-left-width: 0px; + } + + .max-md\:border-r-0 { + border-right-width: 0px; + } +} + @media (min-width: 450px) { .xxs\:flex-row { flex-direction: row; @@ -1649,6 +1674,14 @@ video { } @media (min-width: 768px) { + .md\:mr-2 { + margin-right: 0.5rem; + } + + .md\:block { + display: block; + } + .md\:inline-block { display: inline-block; } @@ -1657,10 +1690,18 @@ video { min-width: 6rem; } + .md\:flex-shrink-0 { + flex-shrink: 0; + } + .md\:gap-4 { gap: 1rem; } + .md\:rounded { + border-radius: 0.25rem; + } + .md\:px-0 { padding-left: 0px; padding-right: 0px; diff --git a/src/www/index.html b/src/www/index.html index 60ee92ff..1d3abf41 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -93,33 +93,33 @@

{{$t("clients")}}

-
+
- + class="hover:bg-red-800 hover:border-red-800 hover:text-white text-gray-700 dark:text-neutral-200 max-md:border-x-0 border-2 border-gray-100 dark:border-neutral-600 py-2 px-4 md:rounded inline-flex items-center transition"> + - {{$t("backup")}} +
From 74372dc05dbd8bd336686f6272a733df5ae10390 Mon Sep 17 00:00:00 2001 From: tetuaoro <65575727+tetuaoro@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:05:18 +0200 Subject: [PATCH 2/6] fix: lint error with workspaces --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index e3f6e86c..81c45aac 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,5 @@ "serve": "docker compose -f docker-compose.yml -f docker-compose.dev.yml up", "sudostart": "sudo docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy", "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" - }, - "workspaces": [ - "src" - ] + } } \ No newline at end of file From 3d376e542ff26aa753d0927aea79864235d10795 Mon Sep 17 00:00:00 2001 From: tetuaoro <65575727+tetuaoro@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:28:30 +0200 Subject: [PATCH 3/6] fix: redundant css --- src/www/css/app.css | 4 ++++ src/www/index.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/www/css/app.css b/src/www/css/app.css index 58bb8441..9e6f654a 100644 --- a/src/www/css/app.css +++ b/src/www/css/app.css @@ -1533,6 +1533,10 @@ video { } @media not all and (min-width: 768px) { + .max-md\:hidden { + display: none; + } + .max-md\:border-x-0 { border-left-width: 0px; border-right-width: 0px; diff --git a/src/www/index.html b/src/www/index.html index 1d3abf41..66dc3697 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -100,7 +100,7 @@ - + {{$t("restore")}} @@ -109,7 +109,7 @@ - + {{$t("backup")}} From d5b8d707ef13e09a410d2c03455e7ad64241a0ed Mon Sep 17 00:00:00 2001 From: Dartegnian Date: Tue, 23 Jul 2024 13:01:08 +0800 Subject: [PATCH 4/6] Get the version info inside the release object --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 826c1ad3..1ae7ef8b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,7 +33,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Set environment variables - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV + run: echo RELEASE=$(cat ./src/package.json | jq -r .release | jq -r .version) >> $GITHUB_ENV - name: Build & Publish Docker Image uses: docker/build-push-action@v6 From 14fd01f4d0eee3445380585a410a1e72c3653745 Mon Sep 17 00:00:00 2001 From: pheiduck <47042125+pheiduck@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:01:39 +0200 Subject: [PATCH 5/6] prepare: version bump and changelog Signed-off-by: pheiduck <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 1f16d864..7b42ffbd 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -1,6 +1,6 @@ { "1": "Initial version. Enjoy!", - "2": "You can now rename a client, and update the address. Enjoy!", + "2": "You can now rename a client & update the address. Enjoy!", "3": "Many improvements and small changes. Enjoy!", "4": "Now with pretty charts for client's network speed. Enjoy!", "5": "Many small improvements & feature requests. Enjoy!", @@ -11,5 +11,6 @@ "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 & more.", + "14": "Home Assistent support, PASSWORD_HASH (inc. Helper), translation updates bugfixes & more." } diff --git a/src/package.json b/src/package.json index 5fe89816..0e4f7c57 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "release": { - "version": "13" + "version": "14" }, "name": "wg-easy", "version": "1.0.1", From 200332df4b0feab7bbac2c952b1a9c5567eb1cd8 Mon Sep 17 00:00:00 2001 From: NPM Update Bot Date: Wed, 24 Jul 2024 15:54:42 +0000 Subject: [PATCH 6/6] npm: package updates --- src/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 7008c880..4634233a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -4760,9 +4760,9 @@ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "node_modules/yaml": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", - "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", + "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", "dev": true, "bin": { "yaml": "bin.mjs"