From 3fe3b82170477ba490f25693a48bebc2b81b0870 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 10 Dec 2024 00:13:27 -0500 Subject: [PATCH 1/2] WebUI: Add Web App manifest to allow standalone usage --- src/webui/www/package.json | 2 +- src/webui/www/public/index.html | 1 + src/webui/www/public/manifest.json | 13 +++++++++++++ src/webui/www/tstool.py | 2 +- src/webui/www/webui.qrc | 1 + 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/webui/www/public/manifest.json diff --git a/src/webui/www/package.json b/src/webui/www/package.json index 818d487385ff..e01aeed026d6 100644 --- a/src/webui/www/package.json +++ b/src/webui/www/package.json @@ -6,7 +6,7 @@ "url": "https://github.com/qbittorrent/qBittorrent.git" }, "scripts": { - "format": "js-beautify -r *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && prettier --write **.css", + "format": "js-beautify -r *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js public/*.json && prettier --write **.css", "lint": "eslint *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public" }, "devDependencies": { diff --git a/src/webui/www/public/index.html b/src/webui/www/public/index.html index a4dbc540a7ca..3733cdc2a11f 100644 --- a/src/webui/www/public/index.html +++ b/src/webui/www/public/index.html @@ -15,6 +15,7 @@ + diff --git a/src/webui/www/public/manifest.json b/src/webui/www/public/manifest.json new file mode 100644 index 000000000000..c4b97cf9a9a2 --- /dev/null +++ b/src/webui/www/public/manifest.json @@ -0,0 +1,13 @@ +{ + "name": "QBT_TR(qBittorrent WebUI)QBT_TR[CONTEXT=Login]", + "icons": [{ + "src": "images/qbittorrent32.png", + "sizes": "32x32", + "type": "image/png" + }, { + "src": "images/qbittorrent-tray.svg", + "sizes": "any", + "type": "image/svg+xml" + }], + "display": "standalone" +} diff --git a/src/webui/www/tstool.py b/src/webui/www/tstool.py index 2166815dcfd2..364694f688b2 100755 --- a/src/webui/www/tstool.py +++ b/src/webui/www/tstool.py @@ -35,7 +35,7 @@ import sys import xml.etree.ElementTree as ET -accepted_exts = [".js", ".html", ".css"] +accepted_exts = [".js", ".html", ".css", ".json"] no_obsolete = False www_folder = "." diff --git a/src/webui/www/webui.qrc b/src/webui/www/webui.qrc index 15f55ca02074..9508167d5718 100644 --- a/src/webui/www/webui.qrc +++ b/src/webui/www/webui.qrc @@ -447,6 +447,7 @@ public/images/qbittorrent-tray.svg public/images/qbittorrent32.png public/index.html + public/manifest.json public/scripts/login.js From e463df19b35bf08db835c1fe1eca18468ef7e67d Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 15 Dec 2024 10:59:27 -0500 Subject: [PATCH 2/2] updates per PR review Co-authored-by: Chocobo1 --- src/webui/www/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webui/www/package.json b/src/webui/www/package.json index e01aeed026d6..2fd69b2ae853 100644 --- a/src/webui/www/package.json +++ b/src/webui/www/package.json @@ -6,7 +6,7 @@ "url": "https://github.com/qbittorrent/qBittorrent.git" }, "scripts": { - "format": "js-beautify -r *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js public/*.json && prettier --write **.css", + "format": "js-beautify -r *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/*.json public/scripts/*.js && prettier --write **.css", "lint": "eslint *.mjs private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public" }, "devDependencies": {