Fix configured QR control URL at startup

This commit is contained in:
2026-08-03 22:05:46 -05:00
parent 50315bcc9e
commit c5d8c6d1bb
4 changed files with 8 additions and 5 deletions
+3 -1
View File
@@ -97,7 +97,9 @@ Module.register("MMM-NextcloudCookbook", {
const qrLabel = document.createElement("span"); const qrLabel = document.createElement("span");
qrLabel.textContent = "Recipe mode control:"; qrLabel.textContent = "Recipe mode control:";
const qrImage = document.createElement("img"); const qrImage = document.createElement("img");
qrImage.src = "/MMM-NextcloudCookbook/qr.svg"; const qrParameters = new URLSearchParams();
if (this.config.controlUrl) qrParameters.set("url", this.config.controlUrl);
qrImage.src = `/MMM-NextcloudCookbook/qr.svg${qrParameters.size ? `?${qrParameters}` : ""}`;
qrImage.alt = "Recipe controller QR code"; qrImage.alt = "Recipe controller QR code";
qr.append(qrLabel, qrImage); qr.append(qrLabel, qrImage);
root.appendChild(qr); root.appendChild(qr);
+2 -1
View File
@@ -57,7 +57,8 @@ module.exports = NodeHelper.create({
); );
this.expressApp.get("/MMM-NextcloudCookbook/qr.svg", async (request, response, next) => { this.expressApp.get("/MMM-NextcloudCookbook/qr.svg", async (request, response, next) => {
try { try {
const url = this.config.controlUrl const url = request.query.url
|| this.config.controlUrl
|| `${request.protocol}://${request.get("host")}${this.config.controlPath}`; || `${request.protocol}://${request.get("host")}${this.config.controlPath}`;
response.type("image/svg+xml").send(await QRCode.toString(url, { type: "svg", margin: 1 })); response.type("image/svg+xml").send(await QRCode.toString(url, { type: "svg", margin: 1 }));
} catch (error) { } catch (error) {
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "mmm-nextcloud-cookbook", "name": "mmm-nextcloud-cookbook",
"version": "0.1.0", "version": "0.1.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mmm-nextcloud-cookbook", "name": "mmm-nextcloud-cookbook",
"version": "0.1.0", "version": "0.1.1",
"dependencies": { "dependencies": {
"fast-xml-parser": "5.10.1", "fast-xml-parser": "5.10.1",
"qrcode": "1.5.4" "qrcode": "1.5.4"
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "mmm-nextcloud-cookbook", "name": "mmm-nextcloud-cookbook",
"version": "0.1.0", "version": "0.1.1",
"private": true, "private": true,
"description": "Display recipes from a Nextcloud Cookbook share on MagicMirror", "description": "Display recipes from a Nextcloud Cookbook share on MagicMirror",
"main": "node_helper.js", "main": "node_helper.js",