diff --git a/Cargo.lock b/Cargo.lock index e4866d54bb..f98f31f7d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4586,7 +4586,7 @@ dependencies = [ ] [[package]] -name = "node-tui" +name = "node-launchpad" version = "0.1.0" dependencies = [ "better-panic", diff --git a/Cargo.toml b/Cargo.toml index d3eeb6d517..9998e149c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [workspace] resolver = "2" members = [ + "node-launchpad", "sn_auditor", "sn_build_info", "sn_cli", @@ -19,7 +20,6 @@ members = [ "sn_transfers", "test_utils", "token_supplies", - "node-tui" ] [workspace.lints.rust] diff --git a/node-tui/.config/config.json5 b/node-launchpad/.config/config.json5 similarity index 100% rename from node-tui/.config/config.json5 rename to node-launchpad/.config/config.json5 diff --git a/node-tui/.envrc b/node-launchpad/.envrc similarity index 100% rename from node-tui/.envrc rename to node-launchpad/.envrc diff --git a/node-tui/.github/workflows/cd.yml b/node-launchpad/.github/workflows/cd.yml similarity index 100% rename from node-tui/.github/workflows/cd.yml rename to node-launchpad/.github/workflows/cd.yml diff --git a/node-tui/.github/workflows/ci.yml b/node-launchpad/.github/workflows/ci.yml similarity index 100% rename from node-tui/.github/workflows/ci.yml rename to node-launchpad/.github/workflows/ci.yml diff --git a/node-tui/.gitignore b/node-launchpad/.gitignore similarity index 100% rename from node-tui/.gitignore rename to node-launchpad/.gitignore diff --git a/node-tui/.rustfmt.toml b/node-launchpad/.rustfmt.toml similarity index 100% rename from node-tui/.rustfmt.toml rename to node-launchpad/.rustfmt.toml diff --git a/node-tui/Cargo.toml b/node-launchpad/Cargo.toml similarity index 85% rename from node-tui/Cargo.toml rename to node-launchpad/Cargo.toml index 45687aa69e..139ccb9621 100644 --- a/node-tui/Cargo.toml +++ b/node-launchpad/Cargo.toml @@ -1,13 +1,15 @@ [package] -name = "node-tui" +authors = ["MaidSafe Developers "] +description = "Node Launchpad" +name = "node-launchpad" version = "0.1.0" edition = "2021" -description = "Terminal interface for autonomi node management" - -authors = ["Josh Wilson "] +license = "GPL-3.0" +homepage = "https://maidsafe.net" +readme = "README.md" +repository = "https://github.com/maidsafe/safe_network" build = "build.rs" - [dependencies] sn_peers_acquisition = { verison = "0.2.10", path = "../sn_peers_acquisition", features = [ "network-contacts", diff --git a/node-tui/LICENSE b/node-launchpad/LICENSE similarity index 100% rename from node-tui/LICENSE rename to node-launchpad/LICENSE diff --git a/node-tui/README.md b/node-launchpad/README.md similarity index 74% rename from node-tui/README.md rename to node-launchpad/README.md index 73c34ec0a5..6eb41bcfca 100644 --- a/node-tui/README.md +++ b/node-launchpad/README.md @@ -1,3 +1,3 @@ -# node-tui +# Node Launchpad Terminal interface for autonomi node management diff --git a/node-tui/build.rs b/node-launchpad/build.rs similarity index 100% rename from node-tui/build.rs rename to node-launchpad/build.rs diff --git a/node-tui/src/action.rs b/node-launchpad/src/action.rs similarity index 100% rename from node-tui/src/action.rs rename to node-launchpad/src/action.rs diff --git a/node-tui/src/app.rs b/node-launchpad/src/app.rs similarity index 100% rename from node-tui/src/app.rs rename to node-launchpad/src/app.rs diff --git a/node-tui/src/cli.rs b/node-launchpad/src/cli.rs similarity index 100% rename from node-tui/src/cli.rs rename to node-launchpad/src/cli.rs diff --git a/node-tui/src/components.rs b/node-launchpad/src/components.rs similarity index 100% rename from node-tui/src/components.rs rename to node-launchpad/src/components.rs diff --git a/node-tui/src/components/home.rs b/node-launchpad/src/components/home.rs similarity index 97% rename from node-tui/src/components/home.rs rename to node-launchpad/src/components/home.rs index 5df55c9d3b..075f0df470 100644 --- a/node-tui/src/components/home.rs +++ b/node-launchpad/src/components/home.rs @@ -14,10 +14,10 @@ use crate::{ }; use color_eyre::eyre::{OptionExt, Result}; use ratatui::{prelude::*, widgets::*}; -use sn_node_manager::{cmd::node::ProgressType, config::get_node_registry_path}; +use sn_node_manager::config::get_node_registry_path; use sn_peers_acquisition::PeersArgs; use sn_service_management::{NodeRegistry, NodeServiceData, ServiceStatus}; -use tokio::sync::mpsc::{self, UnboundedSender}; +use tokio::sync::mpsc::{UnboundedSender}; #[derive(Default)] pub struct Home { @@ -69,7 +69,6 @@ impl Component for Home { info!("Adding a new node service"); let peers = self.peers_args.clone(); - let (progress_sender, _) = mpsc::channel::(1); let action_sender = self.get_actions_sender()?; self.lock_registry = true; @@ -90,7 +89,6 @@ impl Component for Home { None, None, sn_node_manager::VerbosityLevel::Minimal, - progress_sender, ) .await { diff --git a/node-tui/src/components/options.rs b/node-launchpad/src/components/options.rs similarity index 100% rename from node-tui/src/components/options.rs rename to node-launchpad/src/components/options.rs diff --git a/node-tui/src/components/tab.rs b/node-launchpad/src/components/tab.rs similarity index 100% rename from node-tui/src/components/tab.rs rename to node-launchpad/src/components/tab.rs diff --git a/node-tui/src/config.rs b/node-launchpad/src/config.rs similarity index 100% rename from node-tui/src/config.rs rename to node-launchpad/src/config.rs diff --git a/node-tui/src/main.rs b/node-launchpad/src/main.rs similarity index 100% rename from node-tui/src/main.rs rename to node-launchpad/src/main.rs diff --git a/node-tui/src/mode.rs b/node-launchpad/src/mode.rs similarity index 100% rename from node-tui/src/mode.rs rename to node-launchpad/src/mode.rs diff --git a/node-tui/src/tui.rs b/node-launchpad/src/tui.rs similarity index 100% rename from node-tui/src/tui.rs rename to node-launchpad/src/tui.rs diff --git a/node-tui/src/utils.rs b/node-launchpad/src/utils.rs similarity index 100% rename from node-tui/src/utils.rs rename to node-launchpad/src/utils.rs