Skip to content

Add copy to clipboard external address #2183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yzernik merged 3 commits into from
Apr 30, 2022
Merged

Add copy to clipboard external address #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8e3ca4
Include copy to clipboard in external address dialog
yzernik Apr 30, 2022
3bcc118
Fix tooltip
yzernik Apr 30, 2022
036c59c
Update frontend build
yzernik Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
"moment": "^2.29.2",
"react": "^16.13.1",
"react-contenteditable": "^3.3.4",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^16.13.1",
"react-redux": "^7.2.1",
"react-responsive": "^8.1.0",
"react-router-dom": "^5.2.0",
"react-scripts": "^5.0.0",
"react-select": "^5.2.2",
"react-tooltip": "^4.2.21",
"sass": "^1.49.7",
"serve": "^13.0.2",
"socket.io-client": "^2.3.0"
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/Icons.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 39 additions & 4 deletions frontend/src/components/Peers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React, { useEffect, useState, useContext } from 'react'
import './style.scss'
import { withRouter, Link } from 'react-router-dom'
import { ICON_SEARCH, ICON_ARROWBACK, ICON_CLOSE } from '../../Icons'
import { ICON_SEARCH, ICON_ARROWBACK, ICON_CLOSE, ICON_CLIPBOARD } from '../../Icons'
import { getProfileImageSrcString } from '../../squeakimages/images';
import Loader from '../Loader'
import SqueakCard from '../SqueakCard'
import PeerCard from '../../features/peers/PeerCard'
import { CopyToClipboard } from 'react-copy-to-clipboard';
import ReactTooltip from "react-tooltip";

import { Form, Input, Select, Checkbox, Relevant, Debug, TextArea, Option } from 'informed';

Expand Down Expand Up @@ -114,10 +116,43 @@ const Peers = (props) => {
<div className="edit-input-wrap">
<p>Other Squeaknode instances can connect to your node using this address to download squeaks and offers.</p>
</div>
<div className="edit-input-wrap">
<Input class="informed-input" name="host" label="Host" initialValue={externalAddress && externalAddress.getHost()} readOnly />
<Input class="informed-input" name="port" label="Port" initialValue={externalAddress && externalAddress.getPort()} readOnly/>
<div class="float-container">
<div class="float-child">
<div className="edit-input-wrap">
<Input class="informed-input" name="host" label="Host" initialValue={externalAddress && externalAddress.getHost()} readOnly />
</div>
</div>
<div class="float-child">
<CopyToClipboard
text={externalAddress && externalAddress.getHost()}
>
<a data-tip="Copy host">
<button fullWidth={false}>
<ICON_CLIPBOARD />
</button>
</a>
</CopyToClipboard>
</div>
</div>
<div class="float-container">
<div class="float-child">
<div className="edit-input-wrap">
<Input class="informed-input" name="port" label="Port" initialValue={externalAddress && externalAddress.getPort()} readOnly/>
</div>
</div>
<div class="float-child">
<CopyToClipboard
text={externalAddress && externalAddress.getPort()}
>
<a data-tip="Copy port">
<button fullWidth={false}>
<ICON_CLIPBOARD />
</button>
</a>
</CopyToClipboard>
</div>
</div>
<ReactTooltip effect="solid" />
</Form>
);

Expand Down
13 changes: 13 additions & 0 deletions frontend/src/components/Peers/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,16 @@
}
}
}


.float-container {
display: flex; /* ADDED */
align-items: center; /* ADDED */
width: 100%;
}

.float-child {
position: relative;
float: left;
width: 730px;
}
37 changes: 35 additions & 2 deletions frontend/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3308,6 +3308,13 @@
"resolved" "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
"version" "0.4.2"

"copy-to-clipboard@^3.3.1":
"integrity" "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw=="
"resolved" "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"
"version" "3.3.1"
dependencies:
"toggle-selection" "^1.0.6"

"core-js-compat@^3.20.2", "core-js-compat@^3.21.0":
"integrity" "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="
"resolved" "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"
Expand Down Expand Up @@ -7620,6 +7627,14 @@
"fast-deep-equal" "^2.0.1"
"prop-types" "^15.7.1"

"react-copy-to-clipboard@^5.1.0":
"integrity" "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A=="
"resolved" "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz"
"version" "5.1.0"
dependencies:
"copy-to-clipboard" "^3.3.1"
"prop-types" "^15.8.1"

"react-dev-utils@^12.0.0":
"integrity" "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ=="
"resolved" "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz"
Expand Down Expand Up @@ -7650,7 +7665,7 @@
"strip-ansi" "^6.0.1"
"text-table" "^0.2.0"

"react-dom@*", "react-dom@^16.13.1", "react-dom@^16.8.0 || ^17.0.0", "react-dom@>=16.6.0":
"react-dom@*", "react-dom@^16.13.1", "react-dom@^16.8.0 || ^17.0.0", "react-dom@>=16.0.0", "react-dom@>=16.6.0":
"integrity" "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz"
"version" "16.13.1"
Expand Down Expand Up @@ -7798,6 +7813,14 @@
"prop-types" "^15.6.0"
"react-transition-group" "^4.3.0"

"react-tooltip@^4.2.21":
"integrity" "sha512-zSLprMymBDowknr0KVDiJ05IjZn9mQhhg4PRsqln0OZtURAJ1snt1xi5daZfagsh6vfsziZrc9pErPTDY1ACig=="
"resolved" "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.21.tgz"
"version" "4.2.21"
dependencies:
"prop-types" "^15.7.2"
"uuid" "^7.0.3"

"react-transition-group@^4.3.0":
"integrity" "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="
"resolved" "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz"
Expand All @@ -7808,7 +7831,7 @@
"loose-envify" "^1.4.0"
"prop-types" "^15.6.2"

"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0", "react@^16.13.1", "react@^16.8.0", "react@^16.8.0 || ^17.0.0", "react@^16.8.3", "react@^16.9.0 || ^17.0.0 || ^18", "react@>= 16", "react@>=15", "react@>=16.3", "react@>=16.6.0", "react@>=16.8.0":
"react@*", "react@^0.14.0 || ^15.0.0 || ^16.0.0", "react@^15.3.0 || 16 || 17 || 18", "react@^16.13.1", "react@^16.8.0", "react@^16.8.0 || ^17.0.0", "react@^16.8.3", "react@^16.9.0 || ^17.0.0 || ^18", "react@>= 16", "react@>=15", "react@>=16.0.0", "react@>=16.3", "react@>=16.6.0", "react@>=16.8.0":
"integrity" "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="
"resolved" "https://registry.npmjs.org/react/-/react-16.13.1.tgz"
"version" "16.13.1"
Expand Down Expand Up @@ -8949,6 +8972,11 @@
dependencies:
"is-number" "^7.0.0"

"toggle-selection@^1.0.6":
"integrity" "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
"resolved" "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz"
"version" "1.0.6"

"toidentifier@1.0.1":
"integrity" "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
"resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
Expand Down Expand Up @@ -9173,6 +9201,11 @@
"resolved" "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
"version" "1.0.1"

"uuid@^7.0.3":
"integrity" "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
"resolved" "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"
"version" "7.0.3"

"uuid@^8.3.2":
"integrity" "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
"resolved" "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
Expand Down
12 changes: 6 additions & 6 deletions squeaknode/admin/webapp/static/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.991912f7.css",
"main.js": "/static/js/main.734a1632.js",
"main.css": "/static/css/main.fe6c5463.css",
"main.js": "/static/js/main.f6f1567b.js",
"static/css/306.7f7715a0.chunk.css": "/static/css/306.7f7715a0.chunk.css",
"static/js/306.90b2a66c.chunk.js": "/static/js/306.90b2a66c.chunk.js",
"static/css/900.5027b0a1.chunk.css": "/static/css/900.5027b0a1.chunk.css",
Expand All @@ -10,8 +10,8 @@
"static/js/841.9f23f674.chunk.js": "/static/js/841.9f23f674.chunk.js",
"static/media/icon.svg": "/static/media/icon.982210ec9275956e4d3cc77fa90167fd.svg",
"index.html": "/index.html",
"main.991912f7.css.map": "/static/css/main.991912f7.css.map",
"main.734a1632.js.map": "/static/js/main.734a1632.js.map",
"main.fe6c5463.css.map": "/static/css/main.fe6c5463.css.map",
"main.f6f1567b.js.map": "/static/js/main.f6f1567b.js.map",
"306.7f7715a0.chunk.css.map": "/static/css/306.7f7715a0.chunk.css.map",
"306.90b2a66c.chunk.js.map": "/static/js/306.90b2a66c.chunk.js.map",
"900.5027b0a1.chunk.css.map": "/static/css/900.5027b0a1.chunk.css.map",
Expand All @@ -20,7 +20,7 @@
"841.9f23f674.chunk.js.map": "/static/js/841.9f23f674.chunk.js.map"
},
"entrypoints": [
"static/css/main.991912f7.css",
"static/js/main.734a1632.js"
"static/css/main.fe6c5463.css",
"static/js/main.f6f1567b.js"
]
}
2 changes: 1 addition & 1 deletion squeaknode/admin/webapp/static/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#1da1f2"/><meta nam="description" content="Squeaknode!"/><meta name="og:title" content="Squeaknode"/><meta name="og:description" content="check out my the Squeaknode I made"/><link href="https://fonts.googleapis.com/css2?family=Assistant&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Squeaknode</title><script defer="defer" src="/static/js/main.734a1632.js"></script><link href="/static/css/main.991912f7.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#1da1f2"/><meta nam="description" content="Squeaknode!"/><meta name="og:title" content="Squeaknode"/><meta name="og:description" content="check out my the Squeaknode I made"/><link href="https://fonts.googleapis.com/css2?family=Assistant&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Squeaknode</title><script defer="defer" src="/static/js/main.f6f1567b.js"></script><link href="/static/css/main.fe6c5463.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1 change: 0 additions & 1 deletion squeaknode/admin/webapp/static/build/static/css/main.991912f7.css.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...static/build/static/css/main.991912f7.css → ...static/build/static/css/main.fe6c5463.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions squeaknode/admin/webapp/static/build/static/css/main.fe6c5463.css.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions squeaknode/admin/webapp/static/build/static/js/main.734a1632.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion squeaknode/admin/webapp/static/build/static/js/main.734a1632.js.map
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions squeaknode/admin/webapp/static/build/static/js/main.f6f1567b.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ld/static/js/main.734a1632.js.LICENSE.txt → ...ld/static/js/main.f6f1567b.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions squeaknode/admin/webapp/static/build/static/js/main.f6f1567b.js.map
View file
Open in desktop

Large diffs are not rendered by default.