...

iota-cli/src/elements/console_card.rs

@@ -1,4 +1,9 @@
 use crossterm::event::{KeyCode, KeyEvent};
+use iota_logger::{log, log_command, log_cv};
+use iota_state::{ACTIVE_TASKS, RELOAD, SHUTDOWN};
+use iota_storage::users::{user_manager, user_profile::UserProfile};
+use iota_util::file_util;
+use omikron_connector::omikron_connection::OMIKRON_CONNECTION;
 use ratatui::{
     Frame,
     layout::Rect,
@@ -9,19 +14,6 @@ use ratatui::{
 use ttp_core::{CommunicationType, CommunicationValue};
 use uuid::Uuid;
 
-use crate::{
-    ACTIVE_TASKS, RELOAD, SHUTDOWN,
-    gui::{
-        elements::elements::{Element, InteractableElement, JoinableElement},
-        interaction_result::InteractionResult,
-        ui::FPS,
-        util::borders::draw_block_joins,
-    },
-    log, log_command, log_cv,
-    omikron::omikron_connection::OMIKRON_CONNECTION,
-    users::{user_manager, user_profile::UserProfile},
-    util::file_util,
-};
 use std::{
     any::Any,
     sync::{Arc, Mutex},
@@ -29,6 +21,13 @@ use std::{
 };
 use tokio::time::Instant;
 
+use crate::{
+    elements::elements::{Element, InteractableElement, JoinableElement},
+    interaction_result::InteractionResult,
+    ui::FPS,
+    util::borders::draw_block_joins,
+};
+
 pub struct ConsoleCard {
     focused: bool,
     pub title: String,
@@ -425,7 +424,8 @@ pub async fn run_command(command: &str) {
             ping(time).await;
         }
         ["user", "add", username] => {
-            if let (Some(user), Some(_)) = user_manager::create_user(username).await {
+            if let (Some(user), Some(_)) = omikron_connector::user_ops::create_user(username).await
+            {
                 log!("Created user {}", user.user_id);
             } else {
                 log!("Failed to create user");

iota-cli/src/elements/elements.rs

@@ -3,7 +3,7 @@ use std::any::Any;
 use crossterm::event::KeyEvent;
 use ratatui::{Frame, layout::Rect, widgets::Borders};
 
-use crate::gui::{interaction_result::InteractionResult, screens::screens::Screen};
+use crate::{interaction_result::InteractionResult, screens::screens::Screen};
 
 #[allow(unused)]
 pub trait Element: Send + Sync + Any {

iota-cli/src/elements/graph_card.rs

@@ -1,6 +1,7 @@
 use std::{any::Any, sync::Arc};
 
 use crossterm::event::KeyEvent;
+use iota_state::APP_STATE;
 use ratatui::{
     Frame,
     layout::Rect,
@@ -12,13 +13,10 @@ use ratatui::{
 };
 
 use crate::{
-    APP_STATE,
-    gui::{
-        elements::elements::{Element, InteractableElement, JoinableElement},
-        interaction_result::InteractionResult,
-        ui::UI,
-        util::borders::draw_block_joins,
-    },
+    elements::elements::{Element, InteractableElement, JoinableElement},
+    interaction_result::InteractionResult,
+    ui::UI,
+    util::borders::draw_block_joins,
 };
 
 pub enum GRAPHS {

iota-cli/src/elements/log_card.rs

@@ -1,9 +1,9 @@
-use crate::APP_STATE;
-use crate::gui::elements::elements::{Element, InteractableElement, JoinableElement};
-use crate::gui::interaction_result::InteractionResult;
-use crate::gui::util::borders::draw_block_joins;
-use crate::util::logger::PrintType;
+use crate::app_state::APP_STATE;
+use crate::elements::elements::{Element, InteractableElement, JoinableElement};
+use crate::interaction_result::InteractionResult;
+use crate::util::borders::draw_block_joins;
 use crossterm::event::{KeyCode, KeyEvent};
+use iota_logger::PrintType;
 use ratatui::{
     Frame,
     layout::Rect,
@@ -90,7 +90,24 @@ impl LogCard {
 
     fn get_logs(&self) -> Vec<UiLogEntry> {
         let state = APP_STATE.lock().unwrap();
-        state.get_logs().iter().cloned().collect()
+        state
+            .get_logs()
+            .iter()
+            .map(|e| UiLogEntry {
+                timestamp_ms: e.timestamp_ms,
+                sender: match e.sender.as_str() {
+                    "Call" => PrintType::Call,
+                    "Client" => PrintType::Client,
+                    "Iota" => PrintType::Iota,
+                    "Omikron" => PrintType::Omikron,
+                    "Omega" => PrintType::Omega,
+                    "Command" => PrintType::Command,
+                    _ => PrintType::General,
+                },
+                message: e.message.clone(),
+                is_error: e.is_error,
+            })
+            .collect()
     }
 
     fn find_split_point(s: &str, max_width: usize) -> usize {