diff --git a/bin/sozo/src/commands/inspect.rs b/bin/sozo/src/commands/inspect.rs index 9d2149fee0..b811bdadcc 100644 --- a/bin/sozo/src/commands/inspect.rs +++ b/bin/sozo/src/commands/inspect.rs @@ -7,7 +7,7 @@ use dojo_world::ResourceType; use scarb::core::Config; use serde::Serialize; use tabled::settings::object::Cell; -use tabled::settings::{Color, Theme}; +use tabled::settings::{Color, Style}; use tabled::{Table, Tabled}; use tracing::trace; @@ -66,7 +66,7 @@ impl std::fmt::Display for ResourceStatus { ResourceStatus::Updated => write!(f, "{}", "Updated".yellow()), ResourceStatus::Synced => write!(f, "{}", "Synced".green()), ResourceStatus::DirtyLocalPerms => write!(f, "{}", "Dirty local perms".yellow()), - ResourceStatus::MigrationSkipped => write!(f, "{}", "Migration skipped".black()), + ResourceStatus::MigrationSkipped => write!(f, "{}", "Migration skipped".bright_black()), } } } @@ -149,7 +149,7 @@ impl std::fmt::Display for GranteeSource { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { GranteeSource::Local => write!(f, "{}", "Local".blue()), - GranteeSource::Remote => write!(f, "{}", "Remote".black()), + GranteeSource::Remote => write!(f, "{}", "Remote".bright_black()), GranteeSource::Synced => write!(f, "{}", "Synced".green()), } } @@ -439,7 +439,7 @@ where } let mut table = Table::new(data); - table.with(halloween()); + table.with(Style::psql()); if let Some(color) = color { table.modify(Cell::new(0, 0), color); @@ -452,17 +452,6 @@ where println!("{table}\n"); } -pub fn halloween() -> Theme { - let mut style = Theme::default(); - style.set_borders_vertical('💀'); - style.set_borders_left('💀'); - style.set_borders_right('💀'); - - style.set_borders_corner_top_left('🎃'); - - style -} - /// Pretty prints a TOML string. fn pretty_print_toml(str: &str) { for line in str.lines() { @@ -492,7 +481,7 @@ fn pretty_print_toml(str: &str) { _ => value.white(), }; - println!("{}: {}", key.black(), colored_values); + println!("{}: {}", key.bright_black(), colored_values); } else { println!("{}", line); } diff --git a/bin/sozo/src/commands/migrate.rs b/bin/sozo/src/commands/migrate.rs index 30e32c4408..98fde7af28 100644 --- a/bin/sozo/src/commands/migrate.rs +++ b/bin/sozo/src/commands/migrate.rs @@ -73,7 +73,7 @@ impl MigrateArgs { ); let MigrationResult { manifest, has_changes } = - migration.migrate(&mut spinner).await.context("💀 Migration failed.")?; + migration.migrate(&mut spinner).await.context("Migration failed.")?; spinner.update_text("Writing manifest..."); ws.write_manifest_profile(manifest).context("ðŸŠĶ Failed to write manifest.")?; @@ -83,7 +83,7 @@ impl MigrateArgs { let (symbol, end_text) = if has_changes { ("â›Đïļ ", format!("Migration successful with world at address {}", colored_address)) } else { - ("🎃", format!("No changes for world at address {:#066x}", world_address)) + ("ðŸŠĻ ", format!("No changes for world at address {:#066x}", world_address)) }; spinner.stop_and_persist_boxed(symbol, end_text); @@ -106,11 +106,11 @@ async fn print_banner(ws: &Workspace<'_>, starknet: &StarknetOptions) -> Result< let (provider, rpc_url) = starknet.provider(profile_config.env.as_ref())?; let chain_id = provider.chain_id().await?; - let chain_id = parse_cairo_short_string(&chain_id) - .with_context(|| "💀 Cannot parse chain_id as string")?; + let chain_id = + parse_cairo_short_string(&chain_id).with_context(|| "Cannot parse chain_id as string")?; let banner = Banner { - profile: ws.current_profile().expect("💀 Scarb profile should be set.").to_string(), + profile: ws.current_profile().expect("Scarb profile should be set.").to_string(), chain_id, rpc_url, }; diff --git a/crates/sozo/ops/src/migration_ui.rs b/crates/sozo/ops/src/migration_ui.rs index 498a1290a3..d3b325594a 100644 --- a/crates/sozo/ops/src/migration_ui.rs +++ b/crates/sozo/ops/src/migration_ui.rs @@ -22,7 +22,7 @@ impl MigrationUi { /// Returns a new instance with the default frames. pub fn new(text: Option<&'static str>) -> Self { if let Some(text) = text { - let frames = spinner!(["â›Đïļ ", "🎃", "ðŸ‘ŧ", "🧟", "💀"], 500); + let frames = spinner!(["â›Đïļ ", "ðŸĨ· ", "ðŸ—Ąïļ "], 500); let spinner = Spinner::new(frames.clone(), text, None); Self { spinner, default_frames: frames, silent: false } } else {