From 5d0276a80ff49506ca0c1c1c48e2fcf1fc9f0ead Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Wed, 16 Apr 2025 16:43:05 +0200 Subject: [PATCH 1/3] Replace deprecated QRCode component with QRCodeSVG --- src/common/WiFiSettings/WiFiQRCode.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/WiFiSettings/WiFiQRCode.js b/src/common/WiFiSettings/WiFiQRCode.js index e5e39b3..3cb8f9d 100644 --- a/src/common/WiFiSettings/WiFiQRCode.js +++ b/src/common/WiFiSettings/WiFiQRCode.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/) + * Copyright (C) 2019-2025 CZ.NIC z.s.p.o. (https://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -9,7 +9,7 @@ import React, { useState } from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import PropTypes from "prop-types"; -import QRCode from "qrcode.react"; +import { QRCodeSVG } from "qrcode.react"; import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers"; import Button from "../../bootstrap/Button"; @@ -69,13 +69,12 @@ function QRCodeModal({ shown, setShown, SSID, password }) { - From a174d6a612826dafca41c0e69e3b7239d3f426f8 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Wed, 16 Apr 2025 16:43:40 +0200 Subject: [PATCH 2/3] Add Turris logo to enhanced QR code display --- src/common/WiFiSettings/WiFiQRCode.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/WiFiSettings/WiFiQRCode.js b/src/common/WiFiSettings/WiFiQRCode.js index 3cb8f9d..45b7782 100644 --- a/src/common/WiFiSettings/WiFiQRCode.js +++ b/src/common/WiFiSettings/WiFiQRCode.js @@ -75,6 +75,12 @@ function QRCodeModal({ shown, setShown, SSID, password }) { level="M" size={350} marginSize={0} + imageSettings={{ + src: "/reforis/static/reforis/imgs/turris.svg", + height: 40, + width: 40, + excavate: true, + }} /> From 4b58e96f711f62369053f4d32df68e6eedd3c117 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Wed, 16 Apr 2025 16:44:07 +0200 Subject: [PATCH 3/3] Refactor button click handlers to simplify event handling in WiFiQRCode --- src/common/WiFiSettings/WiFiQRCode.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/common/WiFiSettings/WiFiQRCode.js b/src/common/WiFiSettings/WiFiQRCode.js index 45b7782..bf48b6f 100644 --- a/src/common/WiFiSettings/WiFiQRCode.js +++ b/src/common/WiFiSettings/WiFiQRCode.js @@ -33,10 +33,7 @@ export default function WiFiQRCode({ SSID, password }) { - {modal ? ( + {modal && ( - ) : null} + )} ); } @@ -86,19 +83,13 @@ function QRCodeModal({ shown, setShown, SSID, password }) {