refactor: introduced panes and splitted each pane into separate struct 🔥

zaghaghi · Mar 4, 2024 · f03b303 · f03b303
1 parent e117d0b
commit f03b303
Show file tree

Hide file tree

Showing 14 changed files with 653 additions and 279 deletions.
diff --git a/src/action.rs b/src/action.rs
@@ -1,8 +1,6 @@
 use serde::{Deserialize, Serialize};
 use strum::Display;
 
-use crate::components::home::Pane;
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Display, Deserialize)]
 pub enum Action {
   Tick,
@@ -14,7 +12,8 @@ pub enum Action {
   Refresh,
   Error(String),
   Help,
-  Focus(Pane),
+  FocusNext,
+  FocusPrev,
   Up,
   Down,
 }
diff --git a/src/app.rs b/src/app.rs
@@ -6,8 +6,8 @@ use tokio::sync::mpsc;
 
 use crate::{
   action::Action,
-  components::{home::Home, Page},
   config::Config,
+  pages::{home::Home, Page},
   tui,
 };
 
@@ -28,7 +28,7 @@ pub struct App {
 
 impl App {
   pub fn new(openapi_path: String) -> Result<Self> {
-    let home = Home::new(openapi_path);
+    let home = Home::new(openapi_path)?;
     let config = Config::new()?;
     let mode = Mode::Home;
     Ok(Self {
@@ -84,7 +84,7 @@ impl App {
             tui::Event::Resize(x, y) => action_tx.send(Action::Resize(x, y))?,
             tui::Event::Key(key) => {
               if let Some(keymap) = self.config.keybindings.get(&self.mode) {
-                if let Some(action) = keymap.get(&vec![key.clone()]) {
+                if let Some(action) = keymap.get(&vec![key]) {
                   log::info!("Got action: {action:?}");
                   action_tx.send(action.clone())?;
                 } else {

diff --git a/src/components/home.rs b/src/components/home.rs
diff --git a/src/config.rs b/src/config.rs
@@ -66,7 +66,7 @@ impl Config {
     for (mode, default_styles) in default_config.styles.iter() {
       let user_styles = cfg.styles.entry(*mode).or_default();
       for (style_key, style) in default_styles.iter() {
-        user_styles.entry(style_key.clone()).or_insert_with(|| style.clone());
+        user_styles.entry(style_key.clone()).or_insert_with(|| *style);
       }
     }
 

diff --git a/src/main.rs b/src/main.rs
@@ -1,8 +1,9 @@
 pub mod action;
 pub mod app;
 pub mod cli;
-pub mod components;
 pub mod config;
+pub mod pages;
+pub mod panes;
 pub mod tui;
 pub mod utils;
 

diff --git a/src/components.rs → src/pages.rs b/src/components.rs → src/pages.rs
@@ -52,16 +52,3 @@ pub trait Page {
 
   fn draw(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()>;
 }
-
-pub trait Pane {
-  fn init(&mut self) -> Result<()> {
-    Ok(())
-  }
-
-  #[allow(unused_variables)]
-  fn update(&mut self, action: Action) -> Result<Option<Action>> {
-    Ok(None)
-  }
-
-  fn draw(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()>;
-}