Merge branch 'master' into dev

README.md

@@ -37,10 +37,10 @@ And log in again.
 
 ### 2. Run AmneziaWG Easy
 
-```bash
+<pre>
 $ docker run -d \
   --name=amnezia-wg-easy \
-  -e LANG=en \
+  -e LANGUAGE=en \
   -e WG_HOST=<b>🚨YOUR_SERVER_IP</b> \
   -e PASSWORD=<b>🚨YOUR_ADMIN_PASSWORD</b> \
   -v ~/.amnezia-wg-easy:/etc/wireguard \
@@ -53,7 +53,11 @@ $ docker run -d \
   --device=/dev/net/tun:/dev/net/tun \
   --restart unless-stopped \
   ghcr.io/spcfox/amnezia-wg-easy
-```
+</pre>
+
+> 💡 Replace `YOUR_SERVER_IP` with your WAN IP, or a Dynamic DNS hostname.
+>
+> 💡 Replace `YOUR_ADMIN_PASSWORD` with a password to log in on the Web UI.
 
 The Web UI will now be available on `http://0.0.0.0:51821`.
 
@@ -92,6 +96,8 @@ These options can be configured by setting environment variables using `-e KEY="
 | `H3` | `random` | `1234567893` | Underload packet magic header — UnderLoad packet header. Must be < uint_max. |
 | `H4` | `random` | `1234567894` | Transport packet magic header — header of the packet of the data packet. Must be < uint_max. |
 
+> If you change `WG_PORT`, make sure to also change the exposed port.
+
 ## Updating
 
 To update to the latest version, simply run:

src/package.json

@@ -14,15 +14,15 @@
   "license": "GPL",
   "dependencies": {
     "bcryptjs": "^2.4.3",
-    "debug": "^4.3.4",
-    "express": "^4.18.2",
+    "debug": "^4.3.6",
+    "express": "^4.19.2",
     "express-session": "^1.18.0",
     "qrcode": "^1.5.3",
-    "uuid": "^9.0.1"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "eslint-config-athom": "^3.1.3",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.4.7"
   },
   "nodemonConfig": {
     "ignore": [

src/www/css/app.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.7 | 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 {
@@ -1642,11 +1652,6 @@ video {
     color: rgb(115 115 115 / var(--tw-text-opacity));
   }
 
-  .dark\:text-neutral-600 {
-    --tw-text-opacity: 1;
-    color: rgb(82 82 82 / var(--tw-text-opacity));
-  }
-
   .dark\:text-red-300 {
     --tw-text-opacity: 1;
     color: rgb(252 165 165 / var(--tw-text-opacity));