diff --git a/package.json b/package.json index b9745243..6bb4543c 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,14 @@ "version": "0.0.0", "type": "module", "scripts": { - "tauri-dev": "RUST_LOG=warn YAAK_ENV=development tauri dev", + "tauri-dev": "YAAK_ENV=development tauri dev --no-watch --config src-tauri/tauri-dev.conf.json", "tauri-build": "tauri build", "tauri": "tauri", "build": "npm run build:frontend", "dev": "vite dev", "lint": "tsc && eslint . --ext .ts,.tsx", - "build:icon": "tauri icon src-tauri/icons/icon.png", + "build:icon:release": "tauri icon design/icon.png --output src-tauri/icons/release", + "build:icon:dev": "tauri icon design/icon-dev.png --output src-tauri/icons/dev", "build:frontend": "vite build", "test": "vitest", "coverage": "vitest run --coverage", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 8db0d790..5dfcdd35 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2310,46 +2310,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - [[package]] name = "libc" version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libm" version = "0.2.8" @@ -4469,7 +4435,6 @@ dependencies = [ "core-foundation", "core-graphics 0.22.3", "crossbeam-channel", - "dirs-next", "dispatch", "gdk", "gdk-pixbuf", @@ -4484,7 +4449,6 @@ dependencies = [ "instant", "jni", "lazy_static", - "libappindicator", "libc", "log", "ndk", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3d340f72..97a67e79 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -37,7 +37,6 @@ tauri = { version = "1.3", features = [ "os-all", "protocol-asset", "shell-open", - "system-tray", "updater", "window-start-dragging", "dialog-open", diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png deleted file mode 100644 index be7f9d34..00000000 Binary files a/src-tauri/icons/128x128.png and /dev/null differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png deleted file mode 100644 index 884ab756..00000000 Binary files a/src-tauri/icons/128x128@2x.png and /dev/null differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png deleted file mode 100644 index e124c7a6..00000000 Binary files a/src-tauri/icons/32x32.png and /dev/null differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png deleted file mode 100644 index 75e34fbc..00000000 Binary files a/src-tauri/icons/Square107x107Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png deleted file mode 100644 index d8aaeff0..00000000 Binary files a/src-tauri/icons/Square142x142Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png deleted file mode 100644 index 0e7ab850..00000000 Binary files a/src-tauri/icons/Square150x150Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png deleted file mode 100644 index 055cfbe4..00000000 Binary files a/src-tauri/icons/Square284x284Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png deleted file mode 100644 index f8b0234e..00000000 Binary files a/src-tauri/icons/Square30x30Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png deleted file mode 100644 index 8f45f182..00000000 Binary files a/src-tauri/icons/Square310x310Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png deleted file mode 100644 index 6154af77..00000000 Binary files a/src-tauri/icons/Square44x44Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png deleted file mode 100644 index 71aa1fb0..00000000 Binary files a/src-tauri/icons/Square71x71Logo.png and /dev/null differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png deleted file mode 100644 index 91b6ccd2..00000000 Binary files a/src-tauri/icons/Square89x89Logo.png and /dev/null differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png deleted file mode 100644 index abb31c13..00000000 Binary files a/src-tauri/icons/StoreLogo.png and /dev/null differ diff --git a/src-tauri/icons/dev/128x128.png b/src-tauri/icons/dev/128x128.png new file mode 100644 index 00000000..eccde36d Binary files /dev/null and b/src-tauri/icons/dev/128x128.png differ diff --git a/src-tauri/icons/dev/128x128@2x.png b/src-tauri/icons/dev/128x128@2x.png new file mode 100644 index 00000000..fde1d61c Binary files /dev/null and b/src-tauri/icons/dev/128x128@2x.png differ diff --git a/src-tauri/icons/dev/32x32.png b/src-tauri/icons/dev/32x32.png new file mode 100644 index 00000000..d2657c36 Binary files /dev/null and b/src-tauri/icons/dev/32x32.png differ diff --git a/src-tauri/icons/dev/Square107x107Logo.png b/src-tauri/icons/dev/Square107x107Logo.png new file mode 100644 index 00000000..52cfb23a Binary files /dev/null and b/src-tauri/icons/dev/Square107x107Logo.png differ diff --git a/src-tauri/icons/dev/Square142x142Logo.png b/src-tauri/icons/dev/Square142x142Logo.png new file mode 100644 index 00000000..39527bcd Binary files /dev/null and b/src-tauri/icons/dev/Square142x142Logo.png differ diff --git a/src-tauri/icons/dev/Square150x150Logo.png b/src-tauri/icons/dev/Square150x150Logo.png new file mode 100644 index 00000000..3abcf05e Binary files /dev/null and b/src-tauri/icons/dev/Square150x150Logo.png differ diff --git a/src-tauri/icons/dev/Square284x284Logo.png b/src-tauri/icons/dev/Square284x284Logo.png new file mode 100644 index 00000000..deb83446 Binary files /dev/null and b/src-tauri/icons/dev/Square284x284Logo.png differ diff --git a/src-tauri/icons/dev/Square30x30Logo.png b/src-tauri/icons/dev/Square30x30Logo.png new file mode 100644 index 00000000..ffe5a16b Binary files /dev/null and b/src-tauri/icons/dev/Square30x30Logo.png differ diff --git a/src-tauri/icons/dev/Square310x310Logo.png b/src-tauri/icons/dev/Square310x310Logo.png new file mode 100644 index 00000000..8378f19b Binary files /dev/null and b/src-tauri/icons/dev/Square310x310Logo.png differ diff --git a/src-tauri/icons/dev/Square44x44Logo.png b/src-tauri/icons/dev/Square44x44Logo.png new file mode 100644 index 00000000..32d5958a Binary files /dev/null and b/src-tauri/icons/dev/Square44x44Logo.png differ diff --git a/src-tauri/icons/dev/Square71x71Logo.png b/src-tauri/icons/dev/Square71x71Logo.png new file mode 100644 index 00000000..e979a1bb Binary files /dev/null and b/src-tauri/icons/dev/Square71x71Logo.png differ diff --git a/src-tauri/icons/dev/Square89x89Logo.png b/src-tauri/icons/dev/Square89x89Logo.png new file mode 100644 index 00000000..edfbff64 Binary files /dev/null and b/src-tauri/icons/dev/Square89x89Logo.png differ diff --git a/src-tauri/icons/dev/StoreLogo.png b/src-tauri/icons/dev/StoreLogo.png new file mode 100644 index 00000000..b3259b0c Binary files /dev/null and b/src-tauri/icons/dev/StoreLogo.png differ diff --git a/src-tauri/icons/dev/icon.icns b/src-tauri/icons/dev/icon.icns new file mode 100644 index 00000000..a4bf4f46 Binary files /dev/null and b/src-tauri/icons/dev/icon.icns differ diff --git a/src-tauri/icons/dev/icon.ico b/src-tauri/icons/dev/icon.ico new file mode 100644 index 00000000..5b568937 Binary files /dev/null and b/src-tauri/icons/dev/icon.ico differ diff --git a/src-tauri/icons/dev/icon.png b/src-tauri/icons/dev/icon.png new file mode 100644 index 00000000..93d2df8a Binary files /dev/null and b/src-tauri/icons/dev/icon.png differ diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns deleted file mode 100644 index 9ba632e0..00000000 Binary files a/src-tauri/icons/icon.icns and /dev/null differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico deleted file mode 100644 index 6581a2a0..00000000 Binary files a/src-tauri/icons/icon.ico and /dev/null differ diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png deleted file mode 100644 index 414d9370..00000000 Binary files a/src-tauri/icons/icon.png and /dev/null differ diff --git a/src-tauri/icons/release/128x128.png b/src-tauri/icons/release/128x128.png new file mode 100644 index 00000000..d441d393 Binary files /dev/null and b/src-tauri/icons/release/128x128.png differ diff --git a/src-tauri/icons/release/128x128@2x.png b/src-tauri/icons/release/128x128@2x.png new file mode 100644 index 00000000..fb59f114 Binary files /dev/null and b/src-tauri/icons/release/128x128@2x.png differ diff --git a/src-tauri/icons/release/32x32.png b/src-tauri/icons/release/32x32.png new file mode 100644 index 00000000..02858cb6 Binary files /dev/null and b/src-tauri/icons/release/32x32.png differ diff --git a/src-tauri/icons/release/Square107x107Logo.png b/src-tauri/icons/release/Square107x107Logo.png new file mode 100644 index 00000000..e22ca995 Binary files /dev/null and b/src-tauri/icons/release/Square107x107Logo.png differ diff --git a/src-tauri/icons/release/Square142x142Logo.png b/src-tauri/icons/release/Square142x142Logo.png new file mode 100644 index 00000000..c87526ab Binary files /dev/null and b/src-tauri/icons/release/Square142x142Logo.png differ diff --git a/src-tauri/icons/release/Square150x150Logo.png b/src-tauri/icons/release/Square150x150Logo.png new file mode 100644 index 00000000..dbbd97a2 Binary files /dev/null and b/src-tauri/icons/release/Square150x150Logo.png differ diff --git a/src-tauri/icons/release/Square284x284Logo.png b/src-tauri/icons/release/Square284x284Logo.png new file mode 100644 index 00000000..310525b4 Binary files /dev/null and b/src-tauri/icons/release/Square284x284Logo.png differ diff --git a/src-tauri/icons/release/Square30x30Logo.png b/src-tauri/icons/release/Square30x30Logo.png new file mode 100644 index 00000000..d06fdaa6 Binary files /dev/null and b/src-tauri/icons/release/Square30x30Logo.png differ diff --git a/src-tauri/icons/release/Square310x310Logo.png b/src-tauri/icons/release/Square310x310Logo.png new file mode 100644 index 00000000..2e10c20c Binary files /dev/null and b/src-tauri/icons/release/Square310x310Logo.png differ diff --git a/src-tauri/icons/release/Square44x44Logo.png b/src-tauri/icons/release/Square44x44Logo.png new file mode 100644 index 00000000..78526037 Binary files /dev/null and b/src-tauri/icons/release/Square44x44Logo.png differ diff --git a/src-tauri/icons/release/Square71x71Logo.png b/src-tauri/icons/release/Square71x71Logo.png new file mode 100644 index 00000000..6095e64c Binary files /dev/null and b/src-tauri/icons/release/Square71x71Logo.png differ diff --git a/src-tauri/icons/release/Square89x89Logo.png b/src-tauri/icons/release/Square89x89Logo.png new file mode 100644 index 00000000..d9e7881c Binary files /dev/null and b/src-tauri/icons/release/Square89x89Logo.png differ diff --git a/src-tauri/icons/release/StoreLogo.png b/src-tauri/icons/release/StoreLogo.png new file mode 100644 index 00000000..b675e8dd Binary files /dev/null and b/src-tauri/icons/release/StoreLogo.png differ diff --git a/src-tauri/icons/release/icon.icns b/src-tauri/icons/release/icon.icns new file mode 100644 index 00000000..9962b095 Binary files /dev/null and b/src-tauri/icons/release/icon.icns differ diff --git a/src-tauri/icons/release/icon.ico b/src-tauri/icons/release/icon.ico new file mode 100644 index 00000000..7912cfac Binary files /dev/null and b/src-tauri/icons/release/icon.ico differ diff --git a/src-tauri/icons/release/icon.png b/src-tauri/icons/release/icon.png new file mode 100644 index 00000000..6212b036 Binary files /dev/null and b/src-tauri/icons/release/icon.png differ diff --git a/src-tauri/src/analytics.rs b/src-tauri/src/analytics.rs index 789bed54..e2694ae8 100644 --- a/src-tauri/src/analytics.rs +++ b/src-tauri/src/analytics.rs @@ -74,14 +74,14 @@ pub fn track_event( .query(¶ms); if is_dev() { - debug!("Ignore dev analytics event: {} {:?}", event, params); + debug!("Send event (dev): {}", event); } else if let Err(e) = req.send().await { warn!( "Error sending analytics event: {} {} {:?}", e, event, params ); } else { - debug!("Sent analytics event: {}: {:?}", event, params); + debug!("Send event: {}: {:?}", event, params); } }); } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index f0e2d650..be3501a4 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -795,6 +795,9 @@ fn main() { .targets([LogTarget::LogDir, LogTarget::Stdout, LogTarget::Webview]) .level_for("tao", log::LevelFilter::Info) .level_for("sqlx", log::LevelFilter::Warn) + .level_for("hyper", log::LevelFilter::Info) + .level_for("tracing", log::LevelFilter::Info) + .level_for("reqwest", log::LevelFilter::Debug) .with_colors(ColoredLevelConfig::default()) .level(log::LevelFilter::Trace) .build(), @@ -920,10 +923,7 @@ fn create_window(handle: &AppHandle, url: Option<&str>) -> Window { 100.0 + random::() * 30.0, 100.0 + random::() * 30.0, ) - .title(match is_dev() { - true => "Yaak Dev", - false => "Yaak", - }); + .title(handle.package_info().name.to_string()); // Add macOS-only things #[cfg(target_os = "macos")] diff --git a/src-tauri/tauri-dev.conf.json b/src-tauri/tauri-dev.conf.json new file mode 100644 index 00000000..37040e87 --- /dev/null +++ b/src-tauri/tauri-dev.conf.json @@ -0,0 +1,17 @@ +{ + "package": { + "productName": "Daak" + }, + "tauri": { + "bundle": { + "icon": [ + "icons/dev/32x32.png", + "icons/dev/128x128.png", + "icons/dev/128x128@2x.png", + "icons/dev/icon.icns", + "icons/dev/icon.ico" + ], + "identifier": "app.yaak.desktop.dev" + } + } +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 49d00a4c..7d492820 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -65,11 +65,11 @@ "copyright": "", "externalBin": [], "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico" + "icons/release/32x32.png", + "icons/release/128x128.png", + "icons/release/128x128@2x.png", + "icons/release/icon.icns", + "icons/release/icon.ico" ], "identifier": "co.schier.yaak", "longDescription": "The best cross-platform visual API client", @@ -100,10 +100,6 @@ } }, "security": {}, - "systemTray": { - "iconAsTemplate": true, - "iconPath": "icons/icon.png" - }, "updater": { "active": true, "dialog": true,