From e217a8f4242ecb4f5bb4f1c1fd9fb50388ef514d Mon Sep 17 00:00:00 2001 From: Yuttakhan Baingen Date: Sat, 25 Jan 2025 10:01:44 +0700 Subject: [PATCH 1/4] add dependency --- package-lock.json | 20 ++++++++++++++++++++ package.json | 1 + 2 files changed, 21 insertions(+) diff --git a/package-lock.json b/package-lock.json index f8476c622..8450b4613 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,6 +66,7 @@ "react-identicons": "^1.2.4", "react-joyride": "^2.3.0", "react-overlays": "^2.1.1", + "react-qr-code": "^2.0.15", "react-scripts": "5.0.1", "react-virtualized": "^9.22.3", "redux-bundler": "^26.1.0", @@ -61938,6 +61939,12 @@ "teleport": ">=0.2.0" } }, + "node_modules/qr.js": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz", + "integrity": "sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ==", + "license": "MIT" + }, "node_modules/qs": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", @@ -63146,6 +63153,19 @@ "react-dom": "^16.6.0" } }, + "node_modules/react-qr-code": { + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.0.15.tgz", + "integrity": "sha512-MkZcjEXqVKqXEIMVE0mbcGgDpkfSdd8zhuzXEl9QzYeNcw8Hq2oVIzDLWuZN2PQBwM5PWjc2S31K8Q1UbcFMfw==", + "license": "MIT", + "dependencies": { + "prop-types": "^15.8.1", + "qr.js": "0.0.0" + }, + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-refresh": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", diff --git a/package.json b/package.json index ebd838787..77446f700 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,7 @@ "react-identicons": "^1.2.4", "react-joyride": "^2.3.0", "react-overlays": "^2.1.1", + "react-qr-code": "^2.0.15", "react-scripts": "5.0.1", "react-virtualized": "^9.22.3", "redux-bundler": "^26.1.0", From 498ee2f2874040ed94d048094f04dd6ee933bafe Mon Sep 17 00:00:00 2001 From: Yuttakhan Baingen Date: Sat, 25 Jan 2025 10:03:30 +0700 Subject: [PATCH 2/4] add qr code to share modal --- src/files/modals/share-modal/ShareModal.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/files/modals/share-modal/ShareModal.js b/src/files/modals/share-modal/ShareModal.js index 5e713bf5f..86163b057 100644 --- a/src/files/modals/share-modal/ShareModal.js +++ b/src/files/modals/share-modal/ShareModal.js @@ -1,5 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' +import QRCode from 'react-qr-code' import ShareIcon from '../../../icons/StrokeShare.js' import Button from '../../../components/button/button.tsx' import { withTranslation } from 'react-i18next' @@ -9,8 +10,13 @@ import { Modal, ModalActions, ModalBody } from '../../../components/modal/Modal. const ShareModal = ({ t, tReady, onLeave, link, className, ...props }) => ( -

{t('shareModal.description')}

- +

{t('shareModal.description')}

+
+ +
Date: Wed, 29 Jan 2025 10:40:18 +0700 Subject: [PATCH 3/4] remove share file icon and increase size of qr code --- src/files/modals/share-modal/ShareModal.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/files/modals/share-modal/ShareModal.js b/src/files/modals/share-modal/ShareModal.js index 86163b057..ce37a703c 100644 --- a/src/files/modals/share-modal/ShareModal.js +++ b/src/files/modals/share-modal/ShareModal.js @@ -1,7 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' import QRCode from 'react-qr-code' -import ShareIcon from '../../../icons/StrokeShare.js' import Button from '../../../components/button/button.tsx' import { withTranslation } from 'react-i18next' import { CopyToClipboard } from 'react-copy-to-clipboard' @@ -9,11 +8,11 @@ import { Modal, ModalActions, ModalBody } from '../../../components/modal/Modal. const ShareModal = ({ t, tReady, onLeave, link, className, ...props }) => ( - +

{t('shareModal.description')}

From 0a018224bd7c9957d6b4bef06959ecbd8ee3511f Mon Sep 17 00:00:00 2001 From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:53:38 -0600 Subject: [PATCH 4/4] chore: fix dep-check --- .aegir.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.aegir.js b/.aegir.js index 238657020..b395c9b4c 100644 --- a/.aegir.js +++ b/.aegir.js @@ -28,6 +28,7 @@ export default { 'react-identicons', 'react-joyride', 'react-overlays', + 'react-qr-code', 'react-virtualized', 'redux-bundler-react', 'tachyons',