chore(ui): refactor NODE OVERVIEW plus other stuff

Author: luisschwab

src/bonsai.rs

@@ -9,7 +9,7 @@ use iced::window::{Icon, Level, Position, Settings};
 use iced::{Element, Length, Size, Subscription, Task, Theme};
 use tokio::runtime::Handle;
 
-use common::interface::color::{DARK_GREY, GREEN, OFF_WHITE, ORANGE, RED, WHITE, PURPLE, YELLOW};
+use common::interface::color::{DARK_GREY, GREEN, OFF_WHITE, ORANGE, PURPLE, RED, WHITE, YELLOW};
 use common::interface::container::content::{CONTENT_PADDING, CONTENT_SPACING, content_container};
 use common::interface::container::header::{HEADER_HEIGHT, HEADER_PADDING, header_container};
 use common::interface::container::sidebar::{
@@ -102,32 +102,32 @@ impl Bonsai {
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::Ark, PURPLE)),
-            button(text("[NODE] OVERVIEW"))
+            button(text("NODE OVERVIEW"))
                 .on_press(BonsaiMessage::SelectTab(Tab::NodeOverview))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::NodeOverview, GREEN)),
-            button(text("[NODE] P2P"))
+            button(text("NODE P2P"))
                 .on_press(BonsaiMessage::SelectTab(Tab::NodeP2P))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::NodeP2P, GREEN)),
-            button(text("[NODE] BLOCKS"))
+            button(text("NODE BLOCKS"))
                 .on_press(BonsaiMessage::SelectTab(Tab::NodeBlocks))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::NodeBlocks, GREEN)),
-            button(text("[NODE] UTREEXO"))
+            button(text("NODE UTREEXO"))
                 .on_press(BonsaiMessage::SelectTab(Tab::NodeUtreexo))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::NodeUtreexo, GREEN)),
-            button(text("[NODE] SETTINGS"))
+            button(text("NODE SETTINGS"))
                 .on_press(BonsaiMessage::SelectTab(Tab::NodeSettings))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)
                 .style(sidebar_button(self.active_tab == Tab::NodeSettings, GREEN)),
-            button(text("ABOUT"))
+            button(text("ABOUT BONSAI"))
                 .on_press(BonsaiMessage::SelectTab(Tab::About))
                 .height(SIDEBAR_BUTTON_HEIGHT)
                 .width(Length::Fill)

src/common/interface/color.rs

@@ -30,6 +30,13 @@ pub(crate) const WHITE: Color = Color::from_rgb(
     0xff as f32 / 255.0,
 );
 
+/// Black.
+pub(crate) const BLACK: Color = Color::from_rgb(
+    0x00 as f32 / 255.0,
+    0x00 as f32 / 255.0,
+    0x00 as f32 / 255.0,
+);
+
 /// Gold.
 pub(crate) const YELLOW: Color = Color::from_rgb(
     0xff as f32 / 255.0,

src/node/control.rs

@@ -22,7 +22,7 @@ pub const DATA_DIR: &str = "./data/";
 pub const NETWORK: Network = Network::Signet;
 pub const FETCH_STATISTICS_TIME: u64 = 1;
 
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub(crate) enum NodeStatus {
     #[default]
     Inactive,
@@ -66,6 +66,30 @@ impl Node {
                     Err(e) => NodeMessage::Error(BonsaiNodeError::from(e)),
                 })
             }
+            NodeMessage::Restart => {
+                self.status = NodeStatus::ShuttingDown;
+                self.subscription_active = false;
+                self.is_shutting_down = true;
+                self.start_time = None;
+
+                if let Some(node_handle) = self.handle.take() {
+                    let rt_handle = Handle::current();
+
+                    Task::future(async move {
+                        let result = rt_handle
+                            .spawn(async move { stop_node(node_handle).await })
+                            .await;
+
+                        match result {
+                            Ok(Ok(_)) => NodeMessage::Start,
+                            Ok(Err(e)) => NodeMessage::Error(BonsaiNodeError::from(e)),
+                            Err(e) => NodeMessage::Error(BonsaiNodeError::Generic(e.to_string())),
+                        }
+                    })
+                } else {
+                    Task::done(NodeMessage::Start)
+                }
+            }
             NodeMessage::Starting => {
                 self.status = NodeStatus::Starting;
                 self.subscription_active = false;

src/node/interface/blocks/container.rs

@@ -1,2 +1,2 @@
-pub(crate) mod container;
+pub(crate) mod style;
 pub(crate) mod view;

src/node/interface/blocks/mod.rs

@@ -0,0 +1 @@
+

src/node/interface/blocks/style.rs

@@ -0,0 +1 @@
+

src/node/interface/blocks/view.rs

@@ -1,6 +1,6 @@
-pub(crate) mod overview;
+pub(crate) mod blocks;
 pub(crate) mod common;
+pub(crate) mod overview;
 pub(crate) mod p2p;
 pub(crate) mod settings;
 pub(crate) mod utreexo;
-pub(crate) mod blocks;

src/node/interface/mod.rs

@@ -1,2 +1,2 @@
+pub(crate) mod style;
 pub(crate) mod view;
-pub(crate) mod container;