Popup and error messages (#13)

* Add a popup that shows main commands
* Display an error when the date is in a wrong format
* Refactoring
* Updated documentation

Author: R366Y

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "task_rustler"
-version = "0.2.4"
+version = "0.3.1"
 authors = ["r366y"]
 edition = "2021"
 

Cargo.toml

@@ -14,8 +14,9 @@
 
 --- 
 ### Commands
-
-- __e__ insert a new task
+- __h__ help
+![help popup](/pics/help.png)
+- __a__ insert a new task
 ![insert task](/pics/add_task.png)
 - __m__ modify selected task
 ![modify task](/pics/modify_task.png)

README.md

@@ -18,7 +18,7 @@ impl TaskList {
 #[derive(Debug)]
 pub enum InputMode {
     Normal,
-    Editing,
+    Adding,
     EditingExisting,
 }
 #[derive(Debug)]
@@ -36,6 +36,9 @@ pub struct App {
     pub input_mode: InputMode,
     pub input_field: InputField,
     pub tasks_service: TasksService,
+    pub show_popup: bool,
+    pub error_message: String,
+    pub is_error: bool,
 }
 
 impl App {
@@ -48,6 +51,9 @@ impl App {
             input_mode: InputMode::Normal,
             input_field: InputField::Title,
             tasks_service: TasksService::new(db_path),
+            show_popup: false,
+            error_message: String::new(),
+            is_error: false,
         }
     }
 

pics/add_task.png

@@ -1,17 +1,17 @@
 use crate::app::{App, InputField, InputMode};
-use crate::date::{Date, DATE_FORMAT};
+use crate::date::{TaskDate, DATE_FORMAT};
 use crate::task::Task;
 use anyhow::{Context, Result};
 
 pub trait Command {
-    fn execute(&mut self, app: &mut App)-> Result<()>;
+    fn execute(&mut self, app: &mut App) -> Result<()>;
 }
 
 pub struct EnterEditModeCommand;
 
 impl Command for EnterEditModeCommand {
     fn execute(&mut self, app: &mut App) -> Result<()> {
-        app.input_mode = InputMode::Editing;
+        app.input_mode = InputMode::Adding;
         app.input_field = InputField::Title;
         Ok(())
     }
@@ -23,11 +23,12 @@ pub struct AddTaskCommand;
 impl Command for AddTaskCommand {
     fn execute(&mut self, app: &mut App) -> Result<()> {
         let mut t = Task::new();
-        t.title = app.input_title.drain(..).collect();
-        t.description = app.input_description.drain(..).collect();
         if !app.input_date.is_empty() {
-            t.date = Date::try_from(app.input_date.drain(..).collect::<String>()).context("Invalid date")?;
+            t.date = TaskDate::try_from(app.input_date.drain(..).collect::<String>())
+                .context("Invalid date format, use dd-mm-yyyy")?;
         }
+        t.title = app.input_title.drain(..).collect();
+        t.description = app.input_description.drain(..).collect();
         app.tasks_service.add_new_task(&t);
         app.refresh_task_list();
         Ok(())
@@ -76,8 +77,11 @@ impl Command for StartEditingExistingTaskCommand {
         if let Some(index) = app.task_list.state.selected() {
             app.input_title = app.task_list.items[index].title.clone();
             app.input_description = app.task_list.items[index].description.clone();
-            app.input_date = app.task_list.items[index].date.clone().0.map(
-                |d| d.format(DATE_FORMAT).to_string())
+            app.input_date = app.task_list.items[index]
+                .date
+                .clone()
+                .0
+                .map(|d| d.format(DATE_FORMAT).to_string())
                 .unwrap_or(String::new());
             app.input_mode = InputMode::EditingExisting;
             app.input_field = InputField::Title;
@@ -92,16 +96,17 @@ pub struct FinishEditingExistingTaskCommand;
 impl Command for FinishEditingExistingTaskCommand {
     fn execute(&mut self, app: &mut App) -> Result<()> {
         if let Some(index) = app.task_list.state.selected() {
-            app.task_list.items[index].title = app.input_title.drain(..).collect();
-            app.task_list.items[index].description = app.input_description.drain(..).collect();
             if !app.input_date.is_empty() {
-                app.task_list.items[index].date = Date::try_from(app.input_date.drain(..).collect::<String>())?;
+                app.task_list.items[index].date =
+                    TaskDate::try_from(app.input_date.drain(..).collect::<String>())
+                        .context("Invalid date format, use dd-mm-yyyy")?;
             } else {
-                app.task_list.items[index].date = Date(None)
+                app.task_list.items[index].date = TaskDate(None)
             }
+            app.task_list.items[index].title = app.input_title.drain(..).collect();
+            app.task_list.items[index].description = app.input_description.drain(..).collect();
             app.tasks_service.update_task(&app.task_list.items[index])
         }
-        app.input_mode = InputMode::Normal;
         Ok(())
     }
 }

pics/help.png

@@ -1,28 +1,28 @@
+use anyhow::Result;
 use chrono::NaiveDate;
-use anyhow::{ Result};
 
 pub const DATE_FORMAT: &str = "%d-%m-%Y";
 #[derive(Debug, Eq, PartialEq, Clone)]
-pub struct Date(pub Option<NaiveDate>);
+pub struct TaskDate(pub Option<NaiveDate>);
 
-impl TryFrom<String> for Date {
+impl TryFrom<String> for TaskDate {
     type Error = chrono::ParseError;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
         match NaiveDate::parse_from_str(&value, DATE_FORMAT) {
-            Ok(date) => Ok(Date(Some(date))),
+            Ok(date) => Ok(TaskDate(Some(date))),
             Err(e) => Err(e),
         }
     }
 }
 
-impl TryFrom<Date> for String {
+impl TryFrom<TaskDate> for String {
     type Error = &'static str;
 
-    fn try_from(value: Date) -> Result<Self, Self::Error> {
+    fn try_from(value: TaskDate) -> Result<Self, Self::Error> {
         match value.0 {
             Some(date) => Ok(date.format(DATE_FORMAT).to_string()),
             None => Err("Cannot convert None to String"),
         }
     }
-}
+}