diff --git a/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js b/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js index 65fe39cc..2c4d98ec 100644 --- a/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreateContactProfileDialog/CreateContactProfileDialog.js @@ -32,9 +32,8 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { CreateContactProfileRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function CreateContactProfileDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js b/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js index 90f03e5d..7c0ce760 100644 --- a/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreatePeerDialog/CreatePeerDialog.js @@ -32,9 +32,8 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { CreatePeerRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function CreatePeerDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js b/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js index 845fbc88..0ea4c924 100644 --- a/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/CreateSigningProfileDialog/CreateSigningProfileDialog.js @@ -32,9 +32,8 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { CreateSigningProfileRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function CreateSigningProfileDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js b/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js index f0eac813..31dd5025 100644 --- a/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeletePeerDialog/DeletePeerDialog.js @@ -31,9 +31,8 @@ import Widget from "../../components/Widget"; import { DeletePeerRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function DeletePeerDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js b/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js index b5ccce13..de8118f2 100644 --- a/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeleteProfileDialog/DeleteProfileDialog.js @@ -31,9 +31,8 @@ import Widget from "../../components/Widget"; import { DeleteSqueakProfileRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function DeleteProfileDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js b/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js index 8d8402cd..e704ec5b 100644 --- a/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js +++ b/frontend/squeak-node-frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js @@ -32,9 +32,8 @@ import SqueakThreadItem from "../../components/SqueakThreadItem"; import { DeleteSqueakRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function DeleteSqueakDialog({ open, diff --git a/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js b/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js index a4bec7b5..ddb33ede 100644 --- a/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js +++ b/frontend/squeak-node-frontend/src/components/MakeSqueakDialog/MakeSqueakDialog.js @@ -30,9 +30,8 @@ import Widget from "../../components/Widget"; import SqueakThreadItem from "../../components/SqueakThreadItem"; import {MakeSqueakRequest, GetSigningProfilesRequest} from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function MakeSqueakDialog({ open, diff --git a/frontend/squeak-node-frontend/src/pages/buy/Buy.js b/frontend/squeak-node-frontend/src/pages/buy/Buy.js index 9073e533..e5f70aab 100644 --- a/frontend/squeak-node-frontend/src/pages/buy/Buy.js +++ b/frontend/squeak-node-frontend/src/pages/buy/Buy.js @@ -25,9 +25,8 @@ import { GetAncestorSqueakDisplaysRequest, GetBuyOffersRequest, } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function BuyPage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/pages/lightning/Lightning.js b/frontend/squeak-node-frontend/src/pages/lightning/Lightning.js index 834eef55..da898f89 100644 --- a/frontend/squeak-node-frontend/src/pages/lightning/Lightning.js +++ b/frontend/squeak-node-frontend/src/pages/lightning/Lightning.js @@ -1,7 +1,13 @@ import React, { useState, useEffect } from 'react'; import { useParams } from 'react-router-dom'; import {useHistory} from "react-router-dom"; -import { Grid, Button } from "@material-ui/core"; +import { + Grid, + Button, + AppBar, + Tabs, + Tab, +} from "@material-ui/core"; import { useTheme } from "@material-ui/styles"; import { ResponsiveContainer, @@ -26,9 +32,7 @@ import Widget from "../../components/Widget"; import { Typography } from "../../components/Wrappers"; import { GetInfoRequest, WalletBalanceRequest } from "../../proto/lnd_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" - -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') +import { client } from "../../squeakclient/squeakclient" export default function LightningPage() { var classes = useStyles(); @@ -36,6 +40,18 @@ export default function LightningPage() { const [lndInfo, setLndInfo] = useState(null); const [walletBalance, setWalletBalance] = useState(null); + const [value, setValue] = useState(0); + + function a11yProps(index) { + return { + id: `simple-tab-${index}`, + 'aria-controls': `simple-tabpanel-${index}`, + }; + } + + const handleChange = (event, newValue) => { + setValue(newValue); + }; const getLndInfo = () => { console.log("called getLndInfo"); @@ -250,13 +266,50 @@ export default function LightningPage() { ) } + function TabPanel(props) { + const { children, value, index, ...other } = props; + + return ( + + ); + } + + function LightningTabs() { + return ( + <> + + + + + + + + {(lndInfo && walletBalance) + ? InfoContent() + : NoInfoContent() + } + + + foooo + + + ) + } + return ( <> - {(lndInfo && walletBalance) - ? InfoContent() - : NoInfoContent() - } + {LightningTabs()} ); } diff --git a/frontend/squeak-node-frontend/src/pages/peer/Peer.js b/frontend/squeak-node-frontend/src/pages/peer/Peer.js index 1ffd9af4..1bf23eec 100644 --- a/frontend/squeak-node-frontend/src/pages/peer/Peer.js +++ b/frontend/squeak-node-frontend/src/pages/peer/Peer.js @@ -24,9 +24,8 @@ import { SetPeerDownloadingRequest, SetPeerUploadingRequest, } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function PeerPage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/pages/peers/Peers.js b/frontend/squeak-node-frontend/src/pages/peers/Peers.js index 731c14f2..0ae51176 100644 --- a/frontend/squeak-node-frontend/src/pages/peers/Peers.js +++ b/frontend/squeak-node-frontend/src/pages/peers/Peers.js @@ -27,9 +27,8 @@ import mock from "../dashboard/mock"; import { GetPeersRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') const useStyles = makeStyles((theme) => ({ root: { diff --git a/frontend/squeak-node-frontend/src/pages/profile/Profile.js b/frontend/squeak-node-frontend/src/pages/profile/Profile.js index f0d84fe3..5cebdac1 100644 --- a/frontend/squeak-node-frontend/src/pages/profile/Profile.js +++ b/frontend/squeak-node-frontend/src/pages/profile/Profile.js @@ -25,9 +25,8 @@ import { SetSqueakProfileSharingRequest, SetSqueakProfileWhitelistedRequest, } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function ProfilePage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js b/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js index 9b90a1d4..4bfd95ed 100644 --- a/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js +++ b/frontend/squeak-node-frontend/src/pages/profiles/Profiles.js @@ -30,9 +30,8 @@ import { GetSigningProfilesRequest, GetContactProfilesRequest, } from "../../proto/squeak_admin_pb" -import {SqueakAdminClient} from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') const useStyles = makeStyles((theme) => ({ root: { diff --git a/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js b/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js index 1903125f..74b5093f 100644 --- a/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js +++ b/frontend/squeak-node-frontend/src/pages/squeak/Squeak.js @@ -23,9 +23,8 @@ import { GetSqueakDisplayRequest, GetAncestorSqueakDisplaysRequest, } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function SqueakPage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js b/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js index bbbfd788..37bd8f35 100644 --- a/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js +++ b/frontend/squeak-node-frontend/src/pages/squeakaddress/SqueakAddress.js @@ -19,10 +19,10 @@ import CreateContactProfileDialog from "../../components/CreateContactProfileDia import { GetAddressSqueakDisplaysRequest, GetSqueakProfileByAddressRequest, - GetSqueakProfileRequest } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" + GetSqueakProfileRequest, +} from "../../proto/squeak_admin_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function SqueakAddressPage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js b/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js index 52c20c08..4e61c36a 100644 --- a/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js +++ b/frontend/squeak-node-frontend/src/pages/timeline/Timeline.js @@ -38,9 +38,8 @@ import { GetFollowedSqueakDisplaysRequest, GetSigningProfilesRequest, } from "../../proto/squeak_admin_pb" -import { SqueakAdminClient } from "../../proto/squeak_admin_grpc_web_pb" +import { client } from "../../squeakclient/squeakclient" -var client = new SqueakAdminClient('http://' + window.location.hostname + ':8080') export default function TimelinePage() { var classes = useStyles(); diff --git a/frontend/squeak-node-frontend/src/squeakclient/squeakclient.js b/frontend/squeak-node-frontend/src/squeakclient/squeakclient.js new file mode 100644 index 00000000..319eb9eb --- /dev/null +++ b/frontend/squeak-node-frontend/src/squeakclient/squeakclient.js @@ -0,0 +1,3 @@ +import { SqueakAdminClient } from "../proto/squeak_admin_grpc_web_pb" + +export let client = new SqueakAdminClient('http://' + window.location.hostname + ':8080')