From 976307718bc785f96fb4e168ef3b792a56fd1099 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Sun, 16 Jul 2023 19:58:58 -0400 Subject: [PATCH] improve: `mint-manger` style buttons in cards --- Cargo.lock | 2 +- mint-manager/src/components/channels.rs | 86 ++++++++++----------- mint-manager/src/components/ln.rs | 99 ++++++++++++------------- mint-manager/src/components/on_chain.rs | 24 +++--- 4 files changed, 106 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51213df..ff56fcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -500,7 +500,7 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cashu-crab" version = "0.3.0" -source = "git+https://github.com/thesimplekid/cashu-crab?rev=6590ab1412df1e76673eeb548aa007182d2a1b75#6590ab1412df1e76673eeb548aa007182d2a1b75" +source = "git+https://github.com/thesimplekid/cashu-crab#81bb6307aca4fe1784f1834d28a4d73d62b9e745" dependencies = [ "base64 0.21.2", "bitcoin 0.30.0", diff --git a/mint-manager/src/components/channels.rs b/mint-manager/src/components/channels.rs index 5ecf66e..be68856 100644 --- a/mint-manager/src/components/channels.rs +++ b/mint-manager/src/components/channels.rs @@ -86,51 +86,53 @@ impl Component for Channels { let connect_peer_button = ctx.link().callback(|_| Msg::ConnectPeerView); html! { - <> - -
{ "Channels" }
- - { - match &self.view { - View::Channels => { - html!{ - <> - { - self.channels.iter().map(|channel| { - - let remote_balance = channel.value - channel.balance; - - html!{ - - }}).collect::() - } - - - - } - } - View::OpenChannel => { - let back = ctx.link().callback(|_| Msg::Back); - html!{ } - } - View::ConnectPeer => { - let open_channel_cb = ctx.link().callback(|_| Msg::OpenChannelView); - let back = ctx.link().callback(|_| Msg::Back); - html!{ } - + <> + +
{ "Channels" }
+ + { + match &self.view { + View::Channels => { + html!{ + <> + { + self.channels.iter().map(|channel| { + let remote_balance = channel.value - channel.balance; + html!{ + + } + }).collect::() + } +
+ + +
+ + } + } + View::OpenChannel => { + let back = ctx.link().callback(|_| Msg::Back); + html!{ + + } + } + View::ConnectPeer => { + let open_channel_cb = ctx.link().callback(|_| Msg::OpenChannelView); + let back = ctx.link().callback(|_| Msg::Back); + html!{ + + } + } } } - } + + - - - } + } } } diff --git a/mint-manager/src/components/ln.rs b/mint-manager/src/components/ln.rs index 7f7c695..59dd0dd 100644 --- a/mint-manager/src/components/ln.rs +++ b/mint-manager/src/components/ln.rs @@ -211,75 +211,74 @@ impl Component for Ln {
{ "Lightning" }
{ match &self.view { - View::Transactions => { + View::Transactions => { html!{ - <> - - - + <> +
+ + +
+ } - } - View::Receive => { - html! { - -
-
- - -
-
- - + } + View::Receive => { + html! { +
+
+ + +
+
+ + +
+
+ + +
-
- - -
-
- } - } + } View::NewInvoice(invoice) => { - html! { - <> -

+ html! { + <> +

{"Generated Invoice"} -

-

{invoice.to_string() }

-
- + +

{invoice.to_string() }

+
+ // TODO: Copy button // -
- - - } +
+ + } } View::Send(info) => { - html!{ - <> -

- {"Pay Invoice"} -

- - - if let Some((amount, description)) = info { + html!{ + <> +

+ {"Pay Invoice"} +

+ + + if let Some((amount, description)) = info {

{ format!("Description: {}", description ) }

{ format!("Amount (sat): {}", amount.to_sat() ) }

} -
- - -
+
+ + +
- - } + + } - } + } } } diff --git a/mint-manager/src/components/on_chain.rs b/mint-manager/src/components/on_chain.rs index e64f306..d8d23ef 100644 --- a/mint-manager/src/components/on_chain.rs +++ b/mint-manager/src/components/on_chain.rs @@ -159,18 +159,18 @@ impl Component for OnChain { match &self.view { View::Transactions => { html! { - <> - - - - - - - } + <> +
+ + +
+ + + } } View::NewAddress(address) => { html! {