diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e84113f1..2cfd8144 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -51,6 +51,8 @@ services: - shared:/rpc - lnd_dir:/root/.lnd - ./config.ini:/app/config.ini + ports: + - 8774:8774 links: - "btcd:btcd" - "lnd:lnd" diff --git a/frontend/squeak-node-frontend/src/components/Layout/Layout.js b/frontend/squeak-node-frontend/src/components/Layout/Layout.js index 0b56163f..81f553a0 100644 --- a/frontend/squeak-node-frontend/src/components/Layout/Layout.js +++ b/frontend/squeak-node-frontend/src/components/Layout/Layout.js @@ -27,6 +27,7 @@ import Profiles from "../../pages/profiles"; import Icons from "../../pages/icons"; import Charts from "../../pages/charts"; import Subscriptions from "../../pages/subscriptions"; +import Subscription from "../../pages/subscription"; // context import { useLayoutState } from "../../context/LayoutContext"; @@ -57,6 +58,7 @@ function Layout(props) { + { + console.log("called getSubscription with subscriptionId: " + id); + var getSubscriptionRequest = new GetSubscriptionRequest() + getSubscriptionRequest.setSubscriptionId(id); + console.log(getSubscriptionRequest); + client.getSubscription(getSubscriptionRequest, {}, (err, response) => { + console.log(response); + setSubscription(response.getSqueakSubscription()) + }); + }; + + + useEffect(()=>{ + getSubscription(id) + },[id]); + + + function NoSubscriptionContent() { + return ( + + No subscription loaded + + ) + } + + function SubscriptionContent() { + return ( + <> + + Subscription name: {subscription.getSubscriptionName()} + + > + ) + } + + return ( + <> + + + {subscription + ? SubscriptionContent() + : NoSubscriptionContent() + } + + > + ); +} diff --git a/frontend/squeak-node-frontend/src/pages/subscription/package.json b/frontend/squeak-node-frontend/src/pages/subscription/package.json new file mode 100644 index 00000000..1e01872e --- /dev/null +++ b/frontend/squeak-node-frontend/src/pages/subscription/package.json @@ -0,0 +1,6 @@ +{ + "name": "Subscription", + "version": "0.0.0", + "main": "Subscription.js", + "private": true +} diff --git a/frontend/squeak-node-frontend/src/pages/subscription/styles.js b/frontend/squeak-node-frontend/src/pages/subscription/styles.js new file mode 100644 index 00000000..976accde --- /dev/null +++ b/frontend/squeak-node-frontend/src/pages/subscription/styles.js @@ -0,0 +1,15 @@ +import { makeStyles } from "@material-ui/styles"; + +export default makeStyles(theme => ({ + dashedBorder: { + border: "1px dashed", + borderColor: theme.palette.primary.main, + padding: theme.spacing(2), + paddingTop: theme.spacing(4), + paddingBottom: theme.spacing(4), + marginTop: theme.spacing(1), + }, + text: { + marginBottom: theme.spacing(2), + }, +})); diff --git a/frontend/squeak-node-frontend/src/pages/subscriptions/Subscriptions.js b/frontend/squeak-node-frontend/src/pages/subscriptions/Subscriptions.js index 80248d1d..8cd50ff2 100644 --- a/frontend/squeak-node-frontend/src/pages/subscriptions/Subscriptions.js +++ b/frontend/squeak-node-frontend/src/pages/subscriptions/Subscriptions.js @@ -67,6 +67,10 @@ export default function Subscriptions() { }); }; + const goToSubscriptionPage = (id) => { + history.push("/app/Subscription/" + id); + }; + const handleClickOpenCreateSubscriptionDialog = () => { setCreateSubscriptionDialogOpen(true); }; @@ -106,21 +110,33 @@ export default function Subscriptions() { title="Subscriptions" data={subscriptions.map(s => [ + s.getSubscriptionId(), s.getSubscriptionName(), s.getHost(), s.getPort(), ] )} - columns={["Name", "Host", "Port"]} + columns={[ + { + name: "Id", + options: { + display: false, + } + }, + "Name", + "Host", + "Port", + ]} options={{ filter: false, print: false, viewColumns: false, selectableRows: "none", onRowClick: rowData => { - var host = rowData[1]; - console.log("clicked on host" + host); - } + var id = rowData[0]; + console.log("clicked on id" + id); + goToSubscriptionPage(id); + }, }}/>
+ No subscription loaded +
+ Subscription name: {subscription.getSubscriptionName()} +