Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,8 @@
+### Fixes
++ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a]
++ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a]
++ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e]
+
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.1'>v0.0.1</a>
 ### 2022-04-25
 

README.md

@@ -7,7 +7,7 @@
 </p>
 
 <p align="center">
- A simple tui to view and control docker containers"
+ A simple tui to view and control docker containers
 </p>
 
 <p align="center">

create_release.sh

@@ -193,6 +193,7 @@ release_flow() {
 	ask_changelog_update
 	git checkout -b "$RELEASE_BRANCH"
 	update_cargo_toml
+	cargo fmt
 	git add .
 	git commit -m "chore: release $NEW_TAG_VERSION"
 	git checkout main

src/app_data/container_state.rs

@@ -417,7 +417,7 @@ impl Columns {
             name: (String::from("name"), 4),
             state: (String::from("state"), 11),
             status: (String::from("status"), 16),
-            mem: (String::from("mem/limit"), 9),
+            mem: (String::from("memory/limit"), 12),
             net_rx: (String::from("↓ rx"), 5),
             net_tx: (String::from("↑ tx"), 5),
         }

src/app_data/mod.rs

@@ -31,7 +31,6 @@ impl AppData {
         }
     }
 
-  
     // Current time as unix timestamp
     fn get_systemtime(&self) -> u64 {
         SystemTime::now()
@@ -40,7 +39,6 @@ impl AppData {
             .as_secs()
     }
 
- 
     /// Get the current select docker command
     /// So know which command to execute
     pub fn get_docker_command(&self) -> Option<DockerControls> {
@@ -388,7 +386,6 @@ impl AppData {
         self.logs_parsed = true;
     }
 
-
     pub fn update_all_logs(&mut self, all_logs: Vec<Vec<String>>) {
         for (index, output) in all_logs.into_iter().enumerate() {
             self.update_log_by_index(output, index);

src/ui/draw_blocks.rs

@@ -231,7 +231,6 @@ pub fn draw_logs<B: Backend>(
             .block(block)
             .alignment(Alignment::Center);
         f.render_widget(paragraph, area)
-	
     } else if let Some(index) = index {
         let items = app_data.lock().containers.items[index]
             .logs
@@ -350,7 +349,7 @@ fn make_chart<T: Stats + Display>(
                     ),
                 ])
                 // add 0.01, for cases when the value is 0
-                .bounds([0.0, max.get_value() +0.01]),
+                .bounds([0.0, max.get_value() + 0.01]),
         )
 }