diff --git a/Trunk.toml b/Trunk.toml index bd6c484..4587c6e 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -1,2 +1,3 @@ [build] -filehash = false +filehash = true +public_url = "/webv3/" diff --git a/index.html b/index.html index 872b4f4..fe6bbe5 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - eframe template + dominus diff --git a/src/app.rs b/src/app.rs index 11251bc..ab2295e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,8 +1,8 @@ -use egui::{Align, Layout, RichText, WidgetText}; +//use egui::{Align, Layout, RichText, WidgetText}; use egui_extras::RetainedImage; //use nostr_rust::events::Event; use poll_promise::Promise; -use std::borrow::{Borrow, Cow}; +//use std::borrow::{Borrow, Cow}; use std::collections::HashMap; use crate::Event; @@ -16,6 +16,8 @@ pub struct Damus { // Example stuff: label: String, + n_panels: u32, + #[serde(skip)] events: Vec, @@ -35,6 +37,7 @@ impl Default for Damus { events: vec![], img_cache: HashMap::new(), value: 2.7, + n_panels: 1, } } } @@ -82,10 +85,10 @@ fn fetch_img(ctx: &egui::Context, url: &str) -> PromiseQuit on web pages! egui::TopBottomPanel::top("top_panel").show(ctx, |ui| { - // The top panel is often a good place for a menu bar: - egui::menu::bar(ui, |ui| { - ui.menu_button("File", |ui| { - if ui.button("Quit").clicked() { - _frame.close(); + ui.horizontal_wrapped(|ui| { + ui.visuals_mut().button_frame = false; + egui::widgets::global_dark_light_mode_switch(ui); + + if ui + .add(egui::Button::new("+").frame(false)) + .on_hover_text("Add Timeline") + .clicked() + { + app.n_panels += 1; + } + + if app.n_panels != 1 { + if ui + .add(egui::Button::new("-").frame(false)) + .on_hover_text("Add Timeline") + .clicked() + { + app.n_panels -= 1; } - }); + } }); }); - egui::SidePanel::left("side_panel").show(ctx, |ui| timeline_view(ctx, app, ui)); + let screen_size = ctx.input().screen_rect.width(); + let calc_panel_width = (screen_size / app.n_panels as f32) - 30.0; + let min_width = 300.0; + let need_scroll = calc_panel_width < min_width; + let panel_width = if need_scroll { + min_width + } else { + calc_panel_width + }; egui::CentralPanel::default().show(ctx, |ui| { - // The central panel the region left after adding TopPanel's and SidePanel's - - ui.heading("Damus Desktop"); - ui.hyperlink("https://damus.io"); - egui::warn_if_debug_build(ui); + egui::ScrollArea::horizontal() + .auto_shrink([false; 2]) + .show(ui, |ui| { + for ind in 0..app.n_panels { + timeline_panel(ui, app, panel_width, ind); + } + }); }); } +fn timeline_panel(ui: &mut egui::Ui, app: &mut Damus, panel_width: f32, ind: u32) { + egui::SidePanel::left(format!("l{}", ind)) + .resizable(false) + .max_width(panel_width) + .min_width(panel_width) + .show_inside(ui, |ui| { + timeline_view(ui, app); + }); +} + impl eframe::App for Damus { /// Called by the frame work to save state before shutdown. fn save(&mut self, storage: &mut dyn eframe::Storage) { @@ -204,7 +224,7 @@ impl eframe::App for Damus { created_at: 1667781968, kind: 1, tags: vec![], - content: "yello\nthere\nbeep\nboop\nyoink".to_string(), + content: LOREM_IPSUM.into(), sig: "af02c971015995f79e07fa98aaf98adeeb6a56d0005e451ee4e78844cff712a6bc0f2109f72a878975f162dcefde4173b65ebd4c3d3ab3b520a9dcac6acf092d".to_string(), }; @@ -214,7 +234,7 @@ impl eframe::App for Damus { created_at: 1667781968, kind: 1, tags: vec![], - content: "yo yo\nwhats up\nnotmuch".to_string(), + content: LOREM_IPSUM_LONG.into(), sig: "af02c971015995f79e07fa98aaf98adeeb6a56d0005e451ee4e78844cff712a6bc0f2109f72a878975f162dcefde4173b65ebd4c3d3ab3b520a9dcac6acf092d".to_string(), }; @@ -233,3 +253,9 @@ impl eframe::App for Damus { render_damus(ctx, _frame, self); } } + +pub const LOREM_IPSUM: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + +pub const LOREM_IPSUM_LONG: &str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst."; diff --git a/src/event.rs b/src/event.rs index 120aa44..3ee1ec8 100644 --- a/src/event.rs +++ b/src/event.rs @@ -1,5 +1,4 @@ use serde_derive::{Deserialize, Serialize}; -use serde_json::json; /// Event is the struct used to represent a Nostr event #[derive(Serialize, Deserialize, Debug, Clone)]