From 74e3472ebd64102d19cca73e78b2d20a87bddf9f Mon Sep 17 00:00:00 2001 From: sualko Date: Tue, 26 Jan 2021 10:29:13 +0100 Subject: [PATCH] feat: show room url with qr code in edit dialog --- package.json | 1 + ts/Manager/App.scss | 34 ++++++++++++++++++++++++++++++++++ ts/Manager/EditRoomDialog.tsx | 12 ++++++++++++ yarn.lock | 14 ++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/package.json b/package.json index 8e8523a..bdfec72 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "dotenv": "^8.2.0", "execa": "^4.0.0", "libxmljs": "^0.19.7", + "qrcode.react": "^1.0.1", "react-copy-to-clipboard": "^5.0.2", "simple-git": "^2.20.1" }, diff --git a/ts/Manager/App.scss b/ts/Manager/App.scss index cd8859e..f519810 100644 --- a/ts/Manager/App.scss +++ b/ts/Manager/App.scss @@ -250,3 +250,37 @@ pre { white-space: normal; } } + +.bbb-input-container { + display: flex; +} + +.bbb-qrcode-container { + display: block; + height: 34px; + width: 34px; + margin: 3px; + position: relative; + cursor: zoom-in; + + canvas { + max-width: 100%; + max-height: 100%; + position: absolute; + top: 0; + right: 0; + } + + input[type="checkbox"] { + display: none; + + &:checked + canvas { + max-width: none; + max-height: none; + box-shadow: 0 0 10px; + box-shadow: 0 0 5px var(--color-box-shadow); + cursor: zoom-out; + border: 5px solid #fff; + } + } +} \ No newline at end of file diff --git a/ts/Manager/EditRoomDialog.tsx b/ts/Manager/EditRoomDialog.tsx index a089440..307069e 100644 --- a/ts/Manager/EditRoomDialog.tsx +++ b/ts/Manager/EditRoomDialog.tsx @@ -1,5 +1,6 @@ import React, { useState, useEffect } from 'react'; import { CopyToClipboard } from 'react-copy-to-clipboard'; +import QRCode from 'qrcode.react'; import { Access, Room, Permission, RoomShare, api, Restriction } from '../Common/Api'; import Dialog from './Dialog'; import ShareWith from './ShareWith'; @@ -97,6 +98,17 @@ const EditRoomDialog: React.FC = ({ room, restriction, updateProperty, op return ( setOpen(false)} title={t('bbb', 'Edit "{room}"', { room: room.name })}> +
+

{t('bbb', 'Raum URL')}

+
+ +