diff --git a/Cargo.lock b/Cargo.lock index 7c88714..0679578 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,7 +341,6 @@ dependencies = [ "gtk4", "ifc", "lazy_static", - "libadwaita", "memorycache", "reqwest", "serde", @@ -1264,39 +1263,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" -[[package]] -name = "libadwaita" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - [[package]] name = "libc" version = "0.2.147" diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index f4b1434..56d2f49 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -6,7 +6,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -adw = { package = "libadwaita", version = "0.4", features = ["v1_3"] } cairo-rs = { version = "0.17" } chrono = { version = "0.4", features = ["serde"] } fluent-ergonomics = { path = "../fluent-ergonomics/" } @@ -18,7 +17,7 @@ glib = { version = "0.17" } gtk = { version = "0.6", package = "gtk4" } ifc = { path = "../ifc/" } lazy_static = { version = "1.4" } -memorycache = { path = "../memorycache" } +memorycache = { path = "../memorycache/" } reqwest = { version = "0.11", features = ["json"] } serde_derive = { version = "1" } serde_json = { version = "1" } diff --git a/dashboard/src/main.rs b/dashboard/src/main.rs index fee8214..3eaa100 100644 --- a/dashboard/src/main.rs +++ b/dashboard/src/main.rs @@ -139,45 +139,4 @@ pub fn main() { ApplicationExtManual::run_with_args(&app, &args); let _ = runtime.block_on(async { app_handle.await }); - - /* - let now = Local::now(); - let ifc = ifc::IFC::from(now.date_naive().with_year(12023).unwrap()); - let next_event = EVENTS.next_event(now.with_timezone(&Utc)).unwrap(); - - println!( - "{:?}, {:?} {}, {}", - ifc.weekday(), - ifc.month(), - ifc.day(), - ifc.year() - ); - - println!("{:?}", next_event); - - let latitude = Latitude::from(41.78); - let longitude = Longitude::from(-71.41); - let soluna_client = SolunaClient::new(); - let sun_moon = soluna_client - .request(latitude, longitude, Local::now()) - .await; - - println!( - "Solar Transit: {} -> {}", - sun_moon.sunrise.format("%H:%M").to_string(), - sun_moon.sunset.format("%H:%M").to_string() - ); - println!( - "Lunar Transit: {} -> {} [{:?}]", - sun_moon - .moonrise - .map(|time| time.format("%H:%M").to_string()) - .unwrap_or(" -- ".to_owned()), - sun_moon - .moonset - .map(|time| time.format("%H:%M").to_string()) - .unwrap_or(" -- ".to_owned()), - sun_moon.moon_phase - ); - */ }