1
0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-25 00:11:36 +01:00

Merge branch 'wifi-qr-icon' into 'dev'

Update WiFiQRCode component

See merge request turris/reforis/foris-js!226
This commit is contained in:
Aleksandr Gumroian 2024-07-26 14:26:00 +02:00
commit 2e2f326ade
2 changed files with 17 additions and 23 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* Copyright (C) 2019-2024 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.
@ -18,15 +18,12 @@ import {
ModalFooter,
ModalHeader,
} from "../../bootstrap/Modal";
import { ForisURLs } from "../../utils/forisUrls";
WiFiQRCode.propTypes = {
SSID: PropTypes.string.isRequired,
password: PropTypes.string.isRequired,
};
const QR_ICON_PATH = `${ForisURLs.static}/imgs/QR_icon.svg`;
export default function WiFiQRCode({ SSID, password }) {
const [modal, setModal] = useState(false);
@ -40,11 +37,10 @@ export default function WiFiQRCode({ SSID, password }) {
setModal(true);
}}
>
<img
width="20"
src={QR_ICON_PATH}
alt="QR"
style={{ opacity: 0.67 }}
<i
className="fa-solid fa-qrcode"
title={_("Show QR code")}
aria-label={_("Show QR code")}
/>
</button>
{modal ? (

View File

@ -5,7 +5,7 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
- First value
+ Second value
@@ -243,207 +243,95 @@
@@ -242,207 +242,95 @@
value="0"
>
auto
@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
- First value
+ Second value
@@ -527,10 +527,94 @@
@@ -526,10 +526,93 @@
<small>
Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
</small>
@ -370,11 +370,10 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
+ class="input-group-text"
+ type="button"
+ >
+ <img
+ alt="QR"
+ src="/reforis/static/reforis/imgs/QR_icon.svg"
+ style="opacity: 0.67;"
+ width="20"
+ <i
+ aria-label="Show QR code"
+ class="fa-solid fa-qrcode"
+ title="Show QR code"
+ />
+ </button>
+ </div>
@ -434,7 +433,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
class="form-check form-switch mb-3 d-flex align-items-center"
>
<input
@@ -553,10 +637,11 @@
@@ -552,10 +635,11 @@
<div
class="text-end"
>
@ -453,7 +452,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
- First value
+ Second value
@@ -21,10 +21,516 @@
@@ -21,10 +21,515 @@
>
Wi-Fi 1
</h2>
@ -482,11 +481,10 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
+ class="input-group-text"
+ type="button"
+ >
+ <img
+ alt="QR"
+ src="/reforis/static/reforis/imgs/QR_icon.svg"
+ style="opacity: 0.67;"
+ width="20"
+ <i
+ aria-label="Show QR code"
+ class="fa-solid fa-qrcode"
+ title="Show QR code"
+ />
+ </button>
+ </div>