From 693292fc7addb6b17a1a2b3fd4e11833d424cd62 Mon Sep 17 00:00:00 2001
From: RozalieSmit <>
Date: Fri, 31 Jan 2025 16:14:31 +0800
Subject: [PATCH 01/21] commit level 0

---
 src/main/java/Daisy.java | 17 +++++++++++++++++
 src/main/java/Duke.java  | 10 ----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/Daisy.java
 delete mode 100644 src/main/java/Duke.java

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
new file mode 100644
index 000000000..42899e1e7
--- /dev/null
+++ b/src/main/java/Daisy.java
@@ -0,0 +1,17 @@
+public class Daisy {
+    public static void main(String[] args) {
+        String logo = " ____        _        \n"
+                + "|  _ \\ _   _| | _____ \n"
+                + "| | | | | | | |/ / _ \\\n"
+                + "| |_| | |_| |   <  __/\n"
+                + "|____/ \\__,_|_|\\_\\___|\n";
+
+        System.out.println("Hello from\n" + logo);
+        System.out.println("____________________________________________________________");
+        System.out.println(" Hello! I'm Daisy");
+        System.out.println(" What can I do for you?");
+        System.out.println("____________________________________________________________");
+        System.out.println(" Bye. Hope to see you again soon!");
+        System.out.println("____________________________________________________________");
+    }
+}
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
deleted file mode 100644
index 5d313334c..000000000
--- a/src/main/java/Duke.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class Duke {
-    public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-        System.out.println("Hello from\n" + logo);
-    }
-}

From 9554bee270a95b874ef7001844333cb6fc175d9b Mon Sep 17 00:00:00 2001
From: RozalieSmit <>
Date: Thu, 6 Feb 2025 14:42:42 +0800
Subject: [PATCH 02/21] commit exit and repeat function

---
 src/main/java/Daisy.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 42899e1e7..e5d80324b 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,3 +1,5 @@
+import java.util.Scanner;
+
 public class Daisy {
     public static void main(String[] args) {
         String logo = " ____        _        \n"
@@ -11,7 +13,19 @@ public static void main(String[] args) {
         System.out.println(" Hello! I'm Daisy");
         System.out.println(" What can I do for you?");
         System.out.println("____________________________________________________________");
+
+        Scanner scanner = new Scanner(System.in);
+        String input = "";
+        while (true){
+            input = scanner.nextLine();
+            if (input.equals("bye")){
+                break;
+            }
+            System.out.println(input);
+        }
+
         System.out.println(" Bye. Hope to see you again soon!");
         System.out.println("____________________________________________________________");
     }
 }
+

From b49cc8d2590bb5bc2c7e245d7e5ae6994c0cd762 Mon Sep 17 00:00:00 2001
From: RozalieSmit <>
Date: Thu, 6 Feb 2025 14:54:46 +0800
Subject: [PATCH 03/21] commit add and list function

---
 src/main/java/Daisy.java | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index e5d80324b..af7ee6b6c 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,6 +1,10 @@
 import java.util.Scanner;
 
 public class Daisy {
+    private static final int MAX_ITEMS = 100;
+    private static String[] items = new String[MAX_ITEMS];
+    private static int itemCount = 0;
+
     public static void main(String[] args) {
         String logo = " ____        _        \n"
                 + "|  _ \\ _   _| | _____ \n"
@@ -20,6 +24,10 @@ public static void main(String[] args) {
             input = scanner.nextLine();
             if (input.equals("bye")){
                 break;
+            } else if (input.equals("list")){
+                listItems();
+            } else {
+                addItem(input);
             }
             System.out.println(input);
         }
@@ -27,5 +35,27 @@ public static void main(String[] args) {
         System.out.println(" Bye. Hope to see you again soon!");
         System.out.println("____________________________________________________________");
     }
+
+    private static void listItems() {
+        System.out.println("____________________________________________________________");
+        for (int i = 0; i < itemCount; i++) {
+            System.out.println((i + 1) + ". " + items[i]);
+        }
+    }
+
+    private static void addItem(String item) {
+        if (itemCount < MAX_ITEMS) {
+            items[itemCount] = item;
+            itemCount++;
+            System.out.println("____________________________________________________________");
+            System.out.println(" added: " + item);
+            System.out.println("____________________________________________________________");
+        }
+        else {
+            System.out.println("____________________________________________________________");
+            System.out.println("The list is full. Cannot add any more items.");
+            System.out.println("____________________________________________________________");
+        }
+    }
 }
 

From 3632f0f1aa65d6ab46a41beec2ef4627774bfc2b Mon Sep 17 00:00:00 2001
From: RozalieSmit <>
Date: Fri, 7 Feb 2025 10:27:03 +0800
Subject: [PATCH 04/21] commit mark as done function

---
 src/main/java/Daisy.java | 98 ++++++++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 18 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index af7ee6b6c..4ce58fc62 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -2,8 +2,8 @@
 
 public class Daisy {
     private static final int MAX_ITEMS = 100;
-    private static String[] items = new String[MAX_ITEMS];
-    private static int itemCount = 0;
+    private static Task[] tasks = new Task[MAX_ITEMS];
+    private static int taskCount = 0;
 
     public static void main(String[] args) {
         String logo = " ____        _        \n"
@@ -20,42 +20,104 @@ public static void main(String[] args) {
 
         Scanner scanner = new Scanner(System.in);
         String input = "";
-        while (true){
+
+        while (true) {
             input = scanner.nextLine();
-            if (input.equals("bye")){
+            if (input.equals("bye")) {
                 break;
-            } else if (input.equals("list")){
-                listItems();
+            } else if (input.equals("list")) {
+                listTasks();
+            } else if (input.equals("mark ")) {
+                int taskNumber = Integer.parseInt(input.split(" ")[1]);
+                markTask(taskNumber);
+            } else if (input.equals("unmark ")) {
+                int taskNumber = Integer.parseInt(input.split(" ")[1]);
+                unmarkTask(taskNumber);
             } else {
-                addItem(input);
+                addTask(input);
             }
-            System.out.println(input);
         }
 
         System.out.println(" Bye. Hope to see you again soon!");
         System.out.println("____________________________________________________________");
+
+        scanner.close();
+    }
+
+    private static void addTask(String description) {
+        if (taskCount < MAX_ITEMS) {
+            tasks[taskCount] = new Task(description);
+            taskCount++;
+            System.out.println("____________________________________________________________");
+            System.out.println(" added: " + description);
+            System.out.println("____________________________________________________________");
+        } else {
+            System.out.println("____________________________________________________________");
+            System.out.println(" List is full, cannot add more tasks.");
+            System.out.println("____________________________________________________________");
+        }
     }
 
-    private static void listItems() {
+    private static void listTasks() {
         System.out.println("____________________________________________________________");
-        for (int i = 0; i < itemCount; i++) {
-            System.out.println((i + 1) + ". " + items[i]);
+        System.out.println(" Here are the tasks in your list:");
+        for (int i = 0; i < taskCount; i++) {
+            System.out.println((i + 1) + ".[" + tasks[i].getStatusIcon() + "] " + tasks[i].getDescription());
         }
+        System.out.println("____________________________________________________________");
     }
 
-    private static void addItem(String item) {
-        if (itemCount < MAX_ITEMS) {
-            items[itemCount] = item;
-            itemCount++;
+    private static void markTask(int taskNumber) {
+        if (taskNumber > 0 && taskNumber <= taskCount) {
+            tasks[taskNumber - 1].markAsDone();
+            System.out.println("____________________________________________________________");
+            System.out.println(" Nice! I've marked this task as done:");
+            System.out.println("   [X] " + tasks[taskNumber - 1].getDescription());
             System.out.println("____________________________________________________________");
-            System.out.println(" added: " + item);
+        } else {
+            System.out.println("____________________________________________________________");
+            System.out.println(" Invalid task number.");
             System.out.println("____________________________________________________________");
         }
-        else {
+    }
+
+    private static void unmarkTask(int taskNumber) {
+        if (taskNumber > 0 && taskNumber <= taskCount) {
+            tasks[taskNumber - 1].markAsNotDone();
             System.out.println("____________________________________________________________");
-            System.out.println("The list is full. Cannot add any more items.");
+            System.out.println(" OK, I've marked this task as not done yet:");
+            System.out.println("   [ ] " + tasks[taskNumber - 1].getDescription());
+            System.out.println("____________________________________________________________");
+        } else {
+            System.out.println("____________________________________________________________");
+            System.out.println(" Invalid task number.");
             System.out.println("____________________________________________________________");
         }
     }
 }
 
+class Task {
+    protected String description;
+    protected boolean isDone;
+
+    public Task(String description) {
+        this.description = description;
+        this.isDone = false;
+    }
+
+    public String getStatusIcon() {
+        return (isDone ? "X" : " ");
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void markAsDone() {
+        isDone = true;
+    }
+
+    public void markAsNotDone() {
+        isDone = false;
+    }
+}

From de5197009ec9fd4c308b633293f01589a2d9f574 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 03:12:10 +0800
Subject: [PATCH 05/21] code quality update

---
 src/main/java/Daisy.java | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 4ce58fc62..dac1229c9 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,18 +1,14 @@
 import java.util.Scanner;
 
 public class Daisy {
+    // Maximum number of tasks
     private static final int MAX_ITEMS = 100;
     private static Task[] tasks = new Task[MAX_ITEMS];
     private static int taskCount = 0;
 
     public static void main(String[] args) {
-        String logo = " ____        _        \n"
-                + "|  _ \\ _   _| | _____ \n"
-                + "| | | | | | | |/ / _ \\\n"
-                + "| |_| | |_| |   <  __/\n"
-                + "|____/ \\__,_|_|\\_\\___|\n";
-
-        System.out.println("Hello from\n" + logo);
+        // Introduction message
+        System.out.println("Hello from\n");
         System.out.println("____________________________________________________________");
         System.out.println(" Hello! I'm Daisy");
         System.out.println(" What can I do for you?");
@@ -21,18 +17,24 @@ public static void main(String[] args) {
         Scanner scanner = new Scanner(System.in);
         String input = "";
 
+        // Respond to user commands
         while (true) {
             input = scanner.nextLine();
+            // End conversation
             if (input.equals("bye")) {
                 break;
+              // Display list
             } else if (input.equals("list")) {
                 listTasks();
-            } else if (input.equals("mark ")) {
+              // Mark task as done
+            } else if (input.startsWith("mark ")) {
                 int taskNumber = Integer.parseInt(input.split(" ")[1]);
                 markTask(taskNumber);
-            } else if (input.equals("unmark ")) {
+              // Unmark task
+            } else if (input.startsWith("unmark ")) {
                 int taskNumber = Integer.parseInt(input.split(" ")[1]);
                 unmarkTask(taskNumber);
+              // Add task to list
             } else {
                 addTask(input);
             }
@@ -44,6 +46,7 @@ public static void main(String[] args) {
         scanner.close();
     }
 
+    // Add task
     private static void addTask(String description) {
         if (taskCount < MAX_ITEMS) {
             tasks[taskCount] = new Task(description);
@@ -58,6 +61,7 @@ private static void addTask(String description) {
         }
     }
 
+    // List task
     private static void listTasks() {
         System.out.println("____________________________________________________________");
         System.out.println(" Here are the tasks in your list:");
@@ -67,6 +71,7 @@ private static void listTasks() {
         System.out.println("____________________________________________________________");
     }
 
+    // Mark task as done
     private static void markTask(int taskNumber) {
         if (taskNumber > 0 && taskNumber <= taskCount) {
             tasks[taskNumber - 1].markAsDone();
@@ -81,6 +86,7 @@ private static void markTask(int taskNumber) {
         }
     }
 
+    // Unmark task
     private static void unmarkTask(int taskNumber) {
         if (taskNumber > 0 && taskNumber <= taskCount) {
             tasks[taskNumber - 1].markAsNotDone();

From 2288ae69012f501ddf640877c697f6b7c9dadd0f Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 03:44:40 +0800
Subject: [PATCH 06/21] deadline, todo, event tasks

---
 src/main/java/Daisy.java | 87 ++++++++++++++++++++++++++++++++++------
 1 file changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index dac1229c9..49a01e862 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -23,23 +23,35 @@ public static void main(String[] args) {
             // End conversation
             if (input.equals("bye")) {
                 break;
-              // Display list
+                // Display list
             } else if (input.equals("list")) {
                 listTasks();
-              // Mark task as done
+                // Mark task as done
             } else if (input.startsWith("mark ")) {
                 int taskNumber = Integer.parseInt(input.split(" ")[1]);
                 markTask(taskNumber);
-              // Unmark task
+                // Unmark task
             } else if (input.startsWith("unmark ")) {
                 int taskNumber = Integer.parseInt(input.split(" ")[1]);
                 unmarkTask(taskNumber);
-              // Add task to list
+                // Add Todo task
+            } else if (input.startsWith("todo ")) {
+                addTask(new Todo(input.substring(5)));
+                // Add Deadline task
+            } else if (input.startsWith("deadline ")) {
+                String[] parts = input.substring(9).split(" /by ");
+                addTask(new Deadline(parts[0], parts[1]));
+                // Add Event task
+            } else if (input.startsWith("event ")) {
+                String[] parts = input.substring(6).split(" /from | /to ");
+                addTask(new Event(parts[0], parts[1], parts[2]));
+                // Add normal task
             } else {
-                addTask(input);
+                addTask(new Task(input));
             }
         }
 
+        // Goodbye message
         System.out.println(" Bye. Hope to see you again soon!");
         System.out.println("____________________________________________________________");
 
@@ -47,12 +59,14 @@ public static void main(String[] args) {
     }
 
     // Add task
-    private static void addTask(String description) {
+    private static void addTask(Task task) {
         if (taskCount < MAX_ITEMS) {
-            tasks[taskCount] = new Task(description);
+            tasks[taskCount] = task;
             taskCount++;
             System.out.println("____________________________________________________________");
-            System.out.println(" added: " + description);
+            System.out.println(" Got it. I've added this task:");
+            System.out.println("   " + task);
+            System.out.println(" Now you have " + taskCount + " tasks in the list.");
             System.out.println("____________________________________________________________");
         } else {
             System.out.println("____________________________________________________________");
@@ -61,12 +75,12 @@ private static void addTask(String description) {
         }
     }
 
-    // List task
+    // List tasks
     private static void listTasks() {
         System.out.println("____________________________________________________________");
         System.out.println(" Here are the tasks in your list:");
         for (int i = 0; i < taskCount; i++) {
-            System.out.println((i + 1) + ".[" + tasks[i].getStatusIcon() + "] " + tasks[i].getDescription());
+            System.out.println((i + 1) + "." + tasks[i]);
         }
         System.out.println("____________________________________________________________");
     }
@@ -77,7 +91,7 @@ private static void markTask(int taskNumber) {
             tasks[taskNumber - 1].markAsDone();
             System.out.println("____________________________________________________________");
             System.out.println(" Nice! I've marked this task as done:");
-            System.out.println("   [X] " + tasks[taskNumber - 1].getDescription());
+            System.out.println("   " + tasks[taskNumber - 1]);
             System.out.println("____________________________________________________________");
         } else {
             System.out.println("____________________________________________________________");
@@ -92,7 +106,7 @@ private static void unmarkTask(int taskNumber) {
             tasks[taskNumber - 1].markAsNotDone();
             System.out.println("____________________________________________________________");
             System.out.println(" OK, I've marked this task as not done yet:");
-            System.out.println("   [ ] " + tasks[taskNumber - 1].getDescription());
+            System.out.println("   " + tasks[taskNumber - 1]);
             System.out.println("____________________________________________________________");
         } else {
             System.out.println("____________________________________________________________");
@@ -126,4 +140,53 @@ public void markAsDone() {
     public void markAsNotDone() {
         isDone = false;
     }
+
+    @Override
+    public String toString() {
+        return "[" + getStatusIcon() + "] " + description;
+    }
+}
+
+// Todo task
+class Todo extends Task {
+    public Todo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+}
+
+// Deadline task
+class Deadline extends Task {
+    protected String by;
+
+    public Deadline(String description, String by) {
+        super(description);
+        this.by = by;
+    }
+
+    @Override
+    public String toString() {
+        return "[D]" + super.toString() + " (by: " + by + ")";
+    }
+}
+
+// Event task
+class Event extends Task {
+    protected String from;
+    protected String to;
+
+    public Event(String description, String from, String to) {
+        super(description);
+        this.from = from;
+        this.to = to;
+    }
+
+    @Override
+    public String toString() {
+        return "[E]" + super.toString() + " (from: " + from + " to: " + to + ")";
+    }
 }

From 2c942dc599f971070f5f79f91268a610ab12cbb6 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 04:03:16 +0800
Subject: [PATCH 07/21] TextUITesting

---
 src/main/java/Daisy.java  |  1 -
 text-ui-test/EXPECTED.TXT | 32 +++++++++++++++++++++++++-------
 text-ui-test/input.txt    |  5 +++++
 text-ui-test/runtest.sh   |  2 +-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 49a01e862..e11d3a30f 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -8,7 +8,6 @@ public class Daisy {
 
     public static void main(String[] args) {
         // Introduction message
-        System.out.println("Hello from\n");
         System.out.println("____________________________________________________________");
         System.out.println(" Hello! I'm Daisy");
         System.out.println(" What can I do for you?");
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e..63918c9b0 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,25 @@
-Hello from
- ____        _        
-|  _ \ _   _| | _____ 
-| | | | | | | |/ / _ \
-| |_| | |_| |   <  __/
-|____/ \__,_|_|\_\___|
-
+____________________________________________________________
+ Hello! I'm Daisy
+ What can I do for you?
+____________________________________________________________
+____________________________________________________________
+ Got it. I've added this task:
+   [T][ ] borrow book
+ Now you have 1 tasks in the list.
+____________________________________________________________
+____________________________________________________________
+ Here are the tasks in your list:
+1.[T][ ] borrow book
+____________________________________________________________
+____________________________________________________________
+ Got it. I've added this task:
+   [D][ ] return book (by: Sunday)
+ Now you have 2 tasks in the list.
+____________________________________________________________
+____________________________________________________________
+ Got it. I've added this task:
+   [E][ ] project meeting (from: Mon 2pm to: 4pm)
+ Now you have 3 tasks in the list.
+____________________________________________________________
+ Bye. Hope to see you again soon!
+____________________________________________________________
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb..47e576978 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,5 @@
+todo borrow book
+list
+deadline return book /by Sunday
+event project meeting /from Mon 2pm /to 4pm
+bye
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
index c9ec87003..e887b2500 100644
--- a/text-ui-test/runtest.sh
+++ b/text-ui-test/runtest.sh
@@ -20,7 +20,7 @@ then
 fi
 
 # run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ../bin Duke < input.txt > ACTUAL.TXT
+java -classpath ../bin Daisy < input.txt > ACTUAL.TXT
 
 # convert to UNIX format
 cp EXPECTED.TXT EXPECTED-UNIX.TXT

From 6756834ac48a8cfe5a55811a91f1a54909317415 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 04:19:30 +0800
Subject: [PATCH 08/21] Improve code quality

---
 src/main/java/Daisy.java | 140 ++++++++++++++++++++++++++-------------
 1 file changed, 95 insertions(+), 45 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index e11d3a30f..6ae6a953b 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -2,19 +2,16 @@
 
 public class Daisy {
     // Maximum number of tasks
-    private static final int MAX_ITEMS = 100;
-    private static Task[] tasks = new Task[MAX_ITEMS];
+    private static final int MAX_TASKS = 100;
+    private static Task[] tasks = new Task[MAX_TASKS];
     private static int taskCount = 0;
 
     public static void main(String[] args) {
         // Introduction message
-        System.out.println("____________________________________________________________");
-        System.out.println(" Hello! I'm Daisy");
-        System.out.println(" What can I do for you?");
-        System.out.println("____________________________________________________________");
+        printIntroduction();
 
         Scanner scanner = new Scanner(System.in);
-        String input = "";
+        String input;
 
         // Respond to user commands
         while (true) {
@@ -22,58 +19,102 @@ public static void main(String[] args) {
             // End conversation
             if (input.equals("bye")) {
                 break;
-                // Display list
             } else if (input.equals("list")) {
                 listTasks();
-                // Mark task as done
             } else if (input.startsWith("mark ")) {
-                int taskNumber = Integer.parseInt(input.split(" ")[1]);
-                markTask(taskNumber);
-                // Unmark task
+                invalidMarkTask(input);
             } else if (input.startsWith("unmark ")) {
-                int taskNumber = Integer.parseInt(input.split(" ")[1]);
-                unmarkTask(taskNumber);
-                // Add Todo task
+                invalidUnmarkTask(input);
             } else if (input.startsWith("todo ")) {
-                addTask(new Todo(input.substring(5)));
-                // Add Deadline task
+                invalidTodoTask(input);
             } else if (input.startsWith("deadline ")) {
-                String[] parts = input.substring(9).split(" /by ");
-                addTask(new Deadline(parts[0], parts[1]));
-                // Add Event task
+                invalidDeadlineTask(input);
             } else if (input.startsWith("event ")) {
-                String[] parts = input.substring(6).split(" /from | /to ");
-                addTask(new Event(parts[0], parts[1], parts[2]));
-                // Add normal task
+                invalidEventTask(input);
             } else {
                 addTask(new Task(input));
             }
         }
 
         // Goodbye message
+        printGoodbye();
+
+        scanner.close();
+    }
+
+    private static void printIntroduction() {
+        System.out.println("____________________________________________________________");
+        System.out.println(" Hello! I'm Daisy");
+        System.out.println(" What can I do for you?");
+        System.out.println("____________________________________________________________");
+    }
+
+    private static void printGoodbye() {
         System.out.println(" Bye. Hope to see you again soon!");
         System.out.println("____________________________________________________________");
+    }
 
-        scanner.close();
+    private static void invalidMarkTask(String input) {
+        try {
+            int taskNumber = Integer.parseInt(input.split(" ")[1]);
+            markTask(taskNumber);
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'mark <task_number>' instead.");
+        }
+    }
+
+    private static void invalidUnmarkTask(String input) {
+        try {
+            int taskNumber = Integer.parseInt(input.split(" ")[1]);
+            unmarkTask(taskNumber);
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'unmark <task_number>' instead.");
+        }
+    }
+
+    private static void invalidTodoTask(String input) {
+        addTask(new TodoTask(input.substring(5)));
+    }
+
+    private static void invalidDeadlineTask(String input) {
+        String[] parts = input.substring(9).split(" /by ");
+        if (parts.length == 2) {
+            addTask(new DeadlineTask(parts[0], parts[1]));
+        } else {
+            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'deadline <description> /by <time>' instead.");
+        }
+    }
+
+    private static void invalidEventTask(String input) {
+        String[] parts = input.substring(6).split(" /from | /to ");
+        if (parts.length == 3) {
+            addTask(new EventTask(parts[0], parts[1], parts[2]));
+        } else {
+            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'event <description> /from <start_time> /to <end_time>' instead.");
+        }
     }
 
     // Add task
     private static void addTask(Task task) {
-        if (taskCount < MAX_ITEMS) {
+        if (taskCount < MAX_TASKS) {
             tasks[taskCount] = task;
             taskCount++;
-            System.out.println("____________________________________________________________");
-            System.out.println(" Got it. I've added this task:");
-            System.out.println("   " + task);
-            System.out.println(" Now you have " + taskCount + " tasks in the list.");
-            System.out.println("____________________________________________________________");
+            printTaskAdded(task);
         } else {
             System.out.println("____________________________________________________________");
-            System.out.println(" List is full, cannot add more tasks.");
+            System.out.println("Oh no! The list is full, I am unable to add more tasks :(");
             System.out.println("____________________________________________________________");
         }
     }
 
+    private static void printTaskAdded(Task task) {
+        System.out.println("____________________________________________________________");
+        System.out.println(" Got it. I've added this task:");
+        System.out.println("   " + task);
+        System.out.println(" Now you have " + taskCount + " tasks in the list.");
+        System.out.println("____________________________________________________________");
+    }
+
     // List tasks
     private static void listTasks() {
         System.out.println("____________________________________________________________");
@@ -88,10 +129,7 @@ private static void listTasks() {
     private static void markTask(int taskNumber) {
         if (taskNumber > 0 && taskNumber <= taskCount) {
             tasks[taskNumber - 1].markAsDone();
-            System.out.println("____________________________________________________________");
-            System.out.println(" Nice! I've marked this task as done:");
-            System.out.println("   " + tasks[taskNumber - 1]);
-            System.out.println("____________________________________________________________");
+            printTaskMarkedDone(tasks[taskNumber - 1]);
         } else {
             System.out.println("____________________________________________________________");
             System.out.println(" Invalid task number.");
@@ -99,22 +137,34 @@ private static void markTask(int taskNumber) {
         }
     }
 
+    private static void printTaskMarkedDone(Task task) {
+        System.out.println("____________________________________________________________");
+        System.out.println(" Nice! I've marked this task as done:");
+        System.out.println("   " + task);
+        System.out.println("____________________________________________________________");
+    }
+
     // Unmark task
     private static void unmarkTask(int taskNumber) {
         if (taskNumber > 0 && taskNumber <= taskCount) {
             tasks[taskNumber - 1].markAsNotDone();
-            System.out.println("____________________________________________________________");
-            System.out.println(" OK, I've marked this task as not done yet:");
-            System.out.println("   " + tasks[taskNumber - 1]);
-            System.out.println("____________________________________________________________");
+            printTaskUnmarked(tasks[taskNumber - 1]);
         } else {
             System.out.println("____________________________________________________________");
             System.out.println(" Invalid task number.");
             System.out.println("____________________________________________________________");
         }
     }
+
+    private static void printTaskUnmarked(Task task) {
+        System.out.println("____________________________________________________________");
+        System.out.println(" OK, I've marked this task as not done yet:");
+        System.out.println("   " + task);
+        System.out.println("____________________________________________________________");
+    }
 }
 
+// Base Task class
 class Task {
     protected String description;
     protected boolean isDone;
@@ -147,8 +197,8 @@ public String toString() {
 }
 
 // Todo task
-class Todo extends Task {
-    public Todo(String description) {
+class TodoTask extends Task {
+    public TodoTask(String description) {
         super(description);
     }
 
@@ -159,10 +209,10 @@ public String toString() {
 }
 
 // Deadline task
-class Deadline extends Task {
+class DeadlineTask extends Task {
     protected String by;
 
-    public Deadline(String description, String by) {
+    public DeadlineTask(String description, String by) {
         super(description);
         this.by = by;
     }
@@ -174,11 +224,11 @@ public String toString() {
 }
 
 // Event task
-class Event extends Task {
+class EventTask extends Task {
     protected String from;
     protected String to;
 
-    public Event(String description, String from, String to) {
+    public EventTask(String description, String from, String to) {
         super(description);
         this.from = from;
         this.to = to;

From 291d7e1ccfa3583e2f9dc9a112803463333505c9 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 04:51:25 +0800
Subject: [PATCH 09/21] Error handling

---
 src/main/java/Daisy.java | 41 ++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 6ae6a953b..f9b8db759 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -19,20 +19,24 @@ public static void main(String[] args) {
             // End conversation
             if (input.equals("bye")) {
                 break;
+            } else if (input.equals("help")) {
+                printHelp();
             } else if (input.equals("list")) {
                 listTasks();
-            } else if (input.startsWith("mark ")) {
+            } else if (input.startsWith("mark")) {
                 invalidMarkTask(input);
-            } else if (input.startsWith("unmark ")) {
+            } else if (input.startsWith("unmark")) {
                 invalidUnmarkTask(input);
-            } else if (input.startsWith("todo ")) {
+            } else if (input.startsWith("todo")) {
                 invalidTodoTask(input);
-            } else if (input.startsWith("deadline ")) {
+            } else if (input.startsWith("deadline")) {
                 invalidDeadlineTask(input);
-            } else if (input.startsWith("event ")) {
+            } else if (input.startsWith("event")) {
                 invalidEventTask(input);
             } else {
-                addTask(new Task(input));
+                System.out.println("____________________________________________________________");
+                System.out.println("Oh no! It seems like you entered an invalid command. Please try again or enter 'help' for a comprehensive list of commands.");
+                System.out.println("_____________________________________________________________");
             }
         }
 
@@ -54,6 +58,20 @@ private static void printGoodbye() {
         System.out.println("____________________________________________________________");
     }
 
+    private static void printHelp() {
+        System.out.println("____________________________________________________________");
+        System.out.println("Hii, here's the list of available commands with their respective format");
+        System.out.println(" -list: Lists all the tasks");
+        System.out.println(" -mark <task_number>: Marks a task");
+        System.out.println(" -unmark <task_number>: Unmarks a task");
+        System.out.println(" -todo <description>: Adds a new todo task");
+        System.out.println(" -deadline <description> /by <time>: Adds a new deadline task");
+        System.out.println(" -event <description> /from <start_time> /to <end_time>: Adds a new event task");
+        System.out.println(" -bye: Exits the program");
+        System.out.println("Thank you for asking for help :)");
+        System.out.println("______________________________________________________________");
+    }
+
     private static void invalidMarkTask(String input) {
         try {
             int taskNumber = Integer.parseInt(input.split(" ")[1]);
@@ -73,15 +91,18 @@ private static void invalidUnmarkTask(String input) {
     }
 
     private static void invalidTodoTask(String input) {
+        if description
         addTask(new TodoTask(input.substring(5)));
     }
 
     private static void invalidDeadlineTask(String input) {
-        String[] parts = input.substring(9).split(" /by ");
-        if (parts.length == 2) {
-            addTask(new DeadlineTask(parts[0], parts[1]));
+        String description = input.substring(5).trim();
+        if (description.isEmpty()) {
+            System.out.println("____________________________________________________________");
+            System.out.println("Oh no! The description of a todo can't be empty. Please add a description of the todo task or refer to the 'help' command.");
+            System.out.println("____________________________________________________________");
         } else {
-            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'deadline <description> /by <time>' instead.");
+            addTask(new TodoTask(description));
         }
     }
 

From aaf98270e5827eb7f7546047ad1077bde8a8fc88 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Feb 2025 12:41:57 +0800
Subject: [PATCH 10/21] Update A-Exceptions

---
 src/main/java/Daisy.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index f9b8db759..0c2f15d8a 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -3,7 +3,7 @@
 public class Daisy {
     // Maximum number of tasks
     private static final int MAX_TASKS = 100;
-    private static Task[] tasks = new Task[MAX_TASKS];
+    private static final Task[] tasks = new Task[MAX_TASKS];
     private static int taskCount = 0;
 
     public static void main(String[] args) {
@@ -91,8 +91,15 @@ private static void invalidUnmarkTask(String input) {
     }
 
     private static void invalidTodoTask(String input) {
-        if description
-        addTask(new TodoTask(input.substring(5)));
+        String description = input.substring(5).trim();
+
+        if (description.isEmpty()) {
+            System.out.println("____________________________________________________________");
+            System.out.println("Oh no! The description of a todo can't be empty. Please add a description of the todo task or refer to the 'help' command.");
+            System.out.println("____________________________________________________________");
+        } else {
+            addTask(new TodoTask(description));
+        }
     }
 
     private static void invalidDeadlineTask(String input) {

From 0866f91bc50ef10c92b213479ff0c2a3f962ec5a Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 16:45:20 +0800
Subject: [PATCH 11/21] Add the function of deleting a task + Java collection
 classes

---
 src/main/java/Daisy.java | 170 ++++++++++++++++++---------------------
 1 file changed, 77 insertions(+), 93 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 0c2f15d8a..095508ef3 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,21 +1,18 @@
+import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Daisy {
-    // Maximum number of tasks
-    private static final int MAX_TASKS = 100;
-    private static final Task[] tasks = new Task[MAX_TASKS];
-    private static int taskCount = 0;
+    // Store tasks in arrayList
+    private static final ArrayList<Task> tasks = new ArrayList<>();
 
     public static void main(String[] args) {
         // Introduction message
         printIntroduction();
-
         Scanner scanner = new Scanner(System.in);
-        String input;
 
         // Respond to user commands
         while (true) {
-            input = scanner.nextLine();
+            String input = scanner.nextLine();
             // End conversation
             if (input.equals("bye")) {
                 break;
@@ -33,16 +30,17 @@ public static void main(String[] args) {
                 invalidDeadlineTask(input);
             } else if (input.startsWith("event")) {
                 invalidEventTask(input);
+            } else if (input.startsWith("delete")) {
+                invalidDeleteTask(input);
             } else {
                 System.out.println("____________________________________________________________");
-                System.out.println("Oh no! It seems like you entered an invalid command. Please try again or enter 'help' for a comprehensive list of commands.");
-                System.out.println("_____________________________________________________________");
+                System.out.println("Oh no! Invalid command. Type 'help' for a list of commands.");
+                System.out.println("____________________________________________________________");
             }
         }
 
         // Goodbye message
         printGoodbye();
-
         scanner.close();
     }
 
@@ -60,24 +58,38 @@ private static void printGoodbye() {
 
     private static void printHelp() {
         System.out.println("____________________________________________________________");
-        System.out.println("Hii, here's the list of available commands with their respective format");
-        System.out.println(" -list: Lists all the tasks");
-        System.out.println(" -mark <task_number>: Marks a task");
-        System.out.println(" -unmark <task_number>: Unmarks a task");
-        System.out.println(" -todo <description>: Adds a new todo task");
-        System.out.println(" -deadline <description> /by <time>: Adds a new deadline task");
-        System.out.println(" -event <description> /from <start_time> /to <end_time>: Adds a new event task");
-        System.out.println(" -bye: Exits the program");
-        System.out.println("Thank you for asking for help :)");
-        System.out.println("______________________________________________________________");
+        System.out.println("Commands:");
+        System.out.println(" - list: Show all tasks");
+        System.out.println(" - mark <task_number>: Mark a task as done");
+        System.out.println(" - unmark <task_number>: Unmark a task");
+        System.out.println(" - todo <description>: Add a new todo task");
+        System.out.println(" - deadline <description> /by <time>: Add a deadline task");
+        System.out.println(" - event <description> /from <start_time> /to <end_time>: Add an event task");
+        System.out.println(" - delete <task_number>: Remove a task");
+        System.out.println(" - bye: Exit the program");
+        System.out.println("____________________________________________________________");
+    }
+
+    // List task
+    private static void listTasks() {
+        System.out.println("____________________________________________________________");
+        if (tasks.isEmpty()) {
+            System.out.println("Your task list is empty!");
+        } else {
+            System.out.println("Here are the tasks in your list:");
+            for (int i = 0; i < tasks.size(); i++) {
+                System.out.println((i + 1) + ". " + tasks.get(i));
+            }
+        }
+        System.out.println("____________________________________________________________");
     }
 
     private static void invalidMarkTask(String input) {
         try {
             int taskNumber = Integer.parseInt(input.split(" ")[1]);
             markTask(taskNumber);
-        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
-            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'mark <task_number>' instead.");
+        } catch (Exception e) {
+            System.out.println("Invalid format! Use: mark <task_number>");
         }
     }
 
@@ -85,31 +97,26 @@ private static void invalidUnmarkTask(String input) {
         try {
             int taskNumber = Integer.parseInt(input.split(" ")[1]);
             unmarkTask(taskNumber);
-        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
-            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'unmark <task_number>' instead.");
+        } catch (Exception e) {
+            System.out.println("Invalid format! Use: unmark <task_number>");
         }
     }
 
     private static void invalidTodoTask(String input) {
         String description = input.substring(5).trim();
-
         if (description.isEmpty()) {
-            System.out.println("____________________________________________________________");
-            System.out.println("Oh no! The description of a todo can't be empty. Please add a description of the todo task or refer to the 'help' command.");
-            System.out.println("____________________________________________________________");
+            System.out.println("Todo description cannot be empty!");
         } else {
             addTask(new TodoTask(description));
         }
     }
 
     private static void invalidDeadlineTask(String input) {
-        String description = input.substring(5).trim();
-        if (description.isEmpty()) {
-            System.out.println("____________________________________________________________");
-            System.out.println("Oh no! The description of a todo can't be empty. Please add a description of the todo task or refer to the 'help' command.");
-            System.out.println("____________________________________________________________");
+        String[] parts = input.substring(9).split(" /by ");
+        if (parts.length == 2) {
+            addTask(new DeadlineTask(parts[0], parts[1]));
         } else {
-            addTask(new TodoTask(description));
+            System.out.println("Invalid format! Use: deadline <description> /by <time>");
         }
     }
 
@@ -118,77 +125,63 @@ private static void invalidEventTask(String input) {
         if (parts.length == 3) {
             addTask(new EventTask(parts[0], parts[1], parts[2]));
         } else {
-            System.out.println("Oh no! Seems like the command format was invalid. Please use the format 'event <description> /from <start_time> /to <end_time>' instead.");
+            System.out.println("Invalid format! Use: event <description> /from <start_time> /to <end_time>");
         }
     }
 
-    // Add task
-    private static void addTask(Task task) {
-        if (taskCount < MAX_TASKS) {
-            tasks[taskCount] = task;
-            taskCount++;
-            printTaskAdded(task);
-        } else {
-            System.out.println("____________________________________________________________");
-            System.out.println("Oh no! The list is full, I am unable to add more tasks :(");
-            System.out.println("____________________________________________________________");
+    private static void invalidDeleteTask(String input) {
+        try {
+            int taskNumber = Integer.parseInt(input.split(" ")[1]);
+            deleteTask(taskNumber);
+        } catch (Exception e) {
+            System.out.println("Invalid format! Use: delete <task_number>");
         }
     }
 
-    private static void printTaskAdded(Task task) {
+    // Add task
+    private static void addTask(Task task) {
+        tasks.add(task);
         System.out.println("____________________________________________________________");
-        System.out.println(" Got it. I've added this task:");
-        System.out.println("   " + task);
-        System.out.println(" Now you have " + taskCount + " tasks in the list.");
-        System.out.println("____________________________________________________________");
-    }
-
-    // List tasks
-    private static void listTasks() {
-        System.out.println("____________________________________________________________");
-        System.out.println(" Here are the tasks in your list:");
-        for (int i = 0; i < taskCount; i++) {
-            System.out.println((i + 1) + "." + tasks[i]);
-        }
+        System.out.println("Added: " + task);
+        System.out.println("Now you have " + tasks.size() + " tasks in the list.");
         System.out.println("____________________________________________________________");
     }
 
     // Mark task as done
     private static void markTask(int taskNumber) {
-        if (taskNumber > 0 && taskNumber <= taskCount) {
-            tasks[taskNumber - 1].markAsDone();
-            printTaskMarkedDone(tasks[taskNumber - 1]);
-        } else {
+        if (taskNumber > 0 && taskNumber <= tasks.size()) {
+            tasks.get(taskNumber - 1).markAsDone();
             System.out.println("____________________________________________________________");
-            System.out.println(" Invalid task number.");
+            System.out.println("Marked as done: " + tasks.get(taskNumber - 1));
             System.out.println("____________________________________________________________");
+        } else {
+            System.out.println("Invalid task number!");
         }
     }
 
-    private static void printTaskMarkedDone(Task task) {
-        System.out.println("____________________________________________________________");
-        System.out.println(" Nice! I've marked this task as done:");
-        System.out.println("   " + task);
-        System.out.println("____________________________________________________________");
-    }
-
     // Unmark task
     private static void unmarkTask(int taskNumber) {
-        if (taskNumber > 0 && taskNumber <= taskCount) {
-            tasks[taskNumber - 1].markAsNotDone();
-            printTaskUnmarked(tasks[taskNumber - 1]);
-        } else {
+        if (taskNumber > 0 && taskNumber <= tasks.size()) {
+            tasks.get(taskNumber - 1).markAsNotDone();
             System.out.println("____________________________________________________________");
-            System.out.println(" Invalid task number.");
+            System.out.println("Unmarked: " + tasks.get(taskNumber - 1));
             System.out.println("____________________________________________________________");
+        } else {
+            System.out.println("Invalid task number!");
         }
     }
 
-    private static void printTaskUnmarked(Task task) {
-        System.out.println("____________________________________________________________");
-        System.out.println(" OK, I've marked this task as not done yet:");
-        System.out.println("   " + task);
-        System.out.println("____________________________________________________________");
+    // Delete task
+    private static void deleteTask(int taskNumber) {
+        if (taskNumber > 0 && taskNumber <= tasks.size()) {
+            Task removedTask = tasks.remove(taskNumber - 1);
+            System.out.println("____________________________________________________________");
+            System.out.println("Removed: " + removedTask);
+            System.out.println("Now you have " + tasks.size() + " tasks left.");
+            System.out.println("____________________________________________________________");
+        } else {
+            System.out.println("Invalid task number!");
+        }
     }
 }
 
@@ -202,14 +195,6 @@ public Task(String description) {
         this.isDone = false;
     }
 
-    public String getStatusIcon() {
-        return (isDone ? "X" : " ");
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
     public void markAsDone() {
         isDone = true;
     }
@@ -220,7 +205,7 @@ public void markAsNotDone() {
 
     @Override
     public String toString() {
-        return "[" + getStatusIcon() + "] " + description;
+        return "[" + (isDone ? "X" : " ") + "] " + description;
     }
 }
 
@@ -238,7 +223,7 @@ public String toString() {
 
 // Deadline task
 class DeadlineTask extends Task {
-    protected String by;
+    private final String by;
 
     public DeadlineTask(String description, String by) {
         super(description);
@@ -253,8 +238,7 @@ public String toString() {
 
 // Event task
 class EventTask extends Task {
-    protected String from;
-    protected String to;
+    private final String from, to;
 
     public EventTask(String description, String from, String to) {
         super(description);

From 2fc09a66bc799400282f8f8618c02f01c1aed528 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 20:56:57 +0800
Subject: [PATCH 12/21] Save function added

---
 src/main/java/Daisy.java | 108 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 95 insertions(+), 13 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 095508ef3..a4635bb7d 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,11 +1,14 @@
 import java.util.ArrayList;
 import java.util.Scanner;
+import java.io.*;
 
 public class Daisy {
+    private static final String FILE_PATH = "./data/daisy.txt";
     // Store tasks in arrayList
     private static final ArrayList<Task> tasks = new ArrayList<>();
 
     public static void main(String[] args) {
+        Storage.loadTasks(tasks, FILE_PATH);
         // Introduction message
         printIntroduction();
         Scanner scanner = new Scanner(System.in);
@@ -87,7 +90,13 @@ private static void listTasks() {
     private static void invalidMarkTask(String input) {
         try {
             int taskNumber = Integer.parseInt(input.split(" ")[1]);
-            markTask(taskNumber);
+            if (taskNumber < 1 || taskNumber > tasks.size()) {
+                System.out.println("Invalid task number! Please enter a valid task number!");
+                return;
+            }
+            tasks.get(taskNumber - 1).markAsDone();
+            Storage.saveTasks(tasks, FILE_PATH);
+            System.out.println("Marked task as done: " + tasks.get(taskNumber - 1));
         } catch (Exception e) {
             System.out.println("Invalid format! Use: mark <task_number>");
         }
@@ -96,7 +105,13 @@ private static void invalidMarkTask(String input) {
     private static void invalidUnmarkTask(String input) {
         try {
             int taskNumber = Integer.parseInt(input.split(" ")[1]);
-            unmarkTask(taskNumber);
+            if (taskNumber < 1 || taskNumber > tasks.size()) {
+                System.out.println("Invalid task number! Please enter a valid task number!");
+                return;
+            }
+            tasks.get(taskNumber - 1).markAsNotDone();
+            Storage.saveTasks(tasks, FILE_PATH);
+            System.out.println("Unmarked task as done: " + tasks.get(taskNumber - 1));
         } catch (Exception e) {
             System.out.println("Invalid format! Use: unmark <task_number>");
         }
@@ -121,7 +136,7 @@ private static void invalidDeadlineTask(String input) {
     }
 
     private static void invalidEventTask(String input) {
-        String[] parts = input.substring(6).split(" /from | /to ");
+        String[] parts = input.substring(6).split(" /from | /to ", 3);
         if (parts.length == 3) {
             addTask(new EventTask(parts[0], parts[1], parts[2]));
         } else {
@@ -141,6 +156,7 @@ private static void invalidDeleteTask(String input) {
     // Add task
     private static void addTask(Task task) {
         tasks.add(task);
+        Storage.saveTasks(tasks, FILE_PATH);
         System.out.println("____________________________________________________________");
         System.out.println("Added: " + task);
         System.out.println("Now you have " + tasks.size() + " tasks in the list.");
@@ -173,20 +189,58 @@ private static void unmarkTask(int taskNumber) {
 
     // Delete task
     private static void deleteTask(int taskNumber) {
-        if (taskNumber > 0 && taskNumber <= tasks.size()) {
+        if (taskNumber > 1 || taskNumber > tasks.size()) {
+            System.out.println("Invalid task number! Please enter a valid task number!");
+            return;
+        }
             Task removedTask = tasks.remove(taskNumber - 1);
+            Storage.saveTasks(tasks, FILE_PATH);
             System.out.println("____________________________________________________________");
             System.out.println("Removed: " + removedTask);
             System.out.println("Now you have " + tasks.size() + " tasks left.");
             System.out.println("____________________________________________________________");
-        } else {
-            System.out.println("Invalid task number!");
+        }
+}
+
+class Storage {
+    public static void saveTasks(ArrayList<Task> tasks, String filePath) {
+        try {
+            File file = new File(filePath);
+            if (file.getParentFile() != null) {
+                file.getParentFile().mkdirs();
+            }
+            PrintWriter writer = new PrintWriter(file);
+
+            for (Task task : tasks) {
+                writer.println(task.toFileString());
+            }
+            writer.close();
+        } catch (IOException e) {
+            System.out.println("Something went wrong while saving tasks! " + e.getMessage());
+        }
+    }
+
+    public static void loadTasks(ArrayList<Task> tasks, String filePath) {
+        File file = new File(filePath);
+        if (!file.exists()) {
+            return; // No file to load
+        } try {
+            Scanner scanner = new Scanner(file);
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine();
+                Task task = Task.fromFileString(line);
+                if (task != null) {
+                    tasks.add(task);
+                }
+            } scanner.close();
+        } catch (FileNotFoundException e) {
+            System.out.println("Something went wrong while loading tasks! " + e.getMessage());
         }
     }
 }
 
 // Base Task class
-class Task {
+abstract class Task {
     protected String description;
     protected boolean isDone;
 
@@ -203,6 +257,34 @@ public void markAsNotDone() {
         isDone = false;
     }
 
+    public abstract String toFileString();
+
+    public static Task fromFileString(String fileString) {
+        String[] parts = fileString.split(" \\| ");
+        if (parts.length < 3) return null;
+
+        boolean isDone = parts[1].equals("1");
+        String description = parts[2];
+        Task task;
+
+        switch (parts[0]) {
+        case "T":
+            task = new TodoTask(description);
+            break;
+        case "D":
+            if (parts.length < 4) return null;
+            task = new DeadlineTask(description, parts[3]);
+            break;
+        case "E":
+            if (parts.length < 5) return null;
+            task = new EventTask(description, parts[3], parts[4]);
+            break;
+        default:
+            return null;
+        }
+        if (isDone) task.markAsDone();
+        return task;
+    }
     @Override
     public String toString() {
         return "[" + (isDone ? "X" : " ") + "] " + description;
@@ -216,8 +298,8 @@ public TodoTask(String description) {
     }
 
     @Override
-    public String toString() {
-        return "[T]" + super.toString();
+    public String toFileString() {
+        return "T | " + (isDone ? "1" : "0") + " | " + description;
     }
 }
 
@@ -231,8 +313,8 @@ public DeadlineTask(String description, String by) {
     }
 
     @Override
-    public String toString() {
-        return "[D]" + super.toString() + " (by: " + by + ")";
+    public String toFileString() {
+        return "D | " + (isDone ? "1" : "0") + " | " + description + " | " + by;
     }
 }
 
@@ -247,7 +329,7 @@ public EventTask(String description, String from, String to) {
     }
 
     @Override
-    public String toString() {
-        return "[E]" + super.toString() + " (from: " + from + " to: " + to + ")";
+    public String toFileString() {
+        return "E | " + (isDone ? "1" : "0") + " | " + description + " | " + from + " | " + to;
     }
 }

From fd79b631d92f572ae897b035e641be23b26c2f20 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 21:07:22 +0800
Subject: [PATCH 13/21] Create jar file

---
 src/main/java/META-INF/MANIFEST.MF | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/main/java/META-INF/MANIFEST.MF

diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..390b6a539
--- /dev/null
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Daisy
+

From d7482d6b2c8e781539909479b8eeb87db9c7508f Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 21:25:38 +0800
Subject: [PATCH 14/21] Make code more OOP

---
 src/main/java/Daisy.java | 482 ++++++++++++++++++++++-----------------
 1 file changed, 271 insertions(+), 211 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index a4635bb7d..05e0b198a 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -1,245 +1,290 @@
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Scanner;
-import java.io.*;
 
+// Main class
 public class Daisy {
-    private static final String FILE_PATH = "./data/daisy.txt";
-    // Store tasks in arrayList
-    private static final ArrayList<Task> tasks = new ArrayList<>();
+    private Storage storage;
+    private TaskList tasks;
+    private Ui ui;
 
-    public static void main(String[] args) {
-        Storage.loadTasks(tasks, FILE_PATH);
-        // Introduction message
-        printIntroduction();
-        Scanner scanner = new Scanner(System.in);
-
-        // Respond to user commands
-        while (true) {
-            String input = scanner.nextLine();
-            // End conversation
-            if (input.equals("bye")) {
-                break;
-            } else if (input.equals("help")) {
-                printHelp();
-            } else if (input.equals("list")) {
-                listTasks();
-            } else if (input.startsWith("mark")) {
-                invalidMarkTask(input);
-            } else if (input.startsWith("unmark")) {
-                invalidUnmarkTask(input);
-            } else if (input.startsWith("todo")) {
-                invalidTodoTask(input);
-            } else if (input.startsWith("deadline")) {
-                invalidDeadlineTask(input);
-            } else if (input.startsWith("event")) {
-                invalidEventTask(input);
-            } else if (input.startsWith("delete")) {
-                invalidDeleteTask(input);
-            } else {
-                System.out.println("____________________________________________________________");
-                System.out.println("Oh no! Invalid command. Type 'help' for a list of commands.");
-                System.out.println("____________________________________________________________");
+    public Daisy(String filePath) {
+        ui = new Ui();
+        storage = new Storage(filePath);
+        try {
+            tasks = new TaskList(storage.load());
+        } catch (Exception e) {
+            ui.showLoadingError();
+            tasks = new TaskList();
+        }
+    }
+
+    public void run() {
+        ui.showWelcome();
+        boolean isExit = false;
+        while (!isExit) {
+            try {
+                String fullCommand = ui.readCommand();
+                ui.showLine();
+                Command c = Parser.parse(fullCommand);
+                c.execute(tasks, ui, storage);
+                isExit = c.isExit();
+            } catch (Exception e) {
+                ui.showError(e.getMessage());
+            } finally {
+                ui.showLine();
             }
         }
+    }
+
+    public static void main(String[] args) {
+        new Daisy("data/daisy.txt").run();
+    }
+}
+
+// User interface handler
+class Ui {
+    private final Scanner scanner;
 
-        // Goodbye message
-        printGoodbye();
-        scanner.close();
+    public Ui() {
+        scanner = new Scanner(System.in);
     }
 
-    private static void printIntroduction() {
+    public void showWelcome() {
         System.out.println("____________________________________________________________");
-        System.out.println(" Hello! I'm Daisy");
+        System.out.println(" Hello! I'm Daisy 🌼");
         System.out.println(" What can I do for you?");
+        System.out.println(" Type 'help' to see available commands.");
         System.out.println("____________________________________________________________");
     }
 
-    private static void printGoodbye() {
-        System.out.println(" Bye. Hope to see you again soon!");
-        System.out.println("____________________________________________________________");
+    public void showGoodbye() {
+        System.out.println(" Bye! Hope to see you again soon. 🌸");
     }
 
-    private static void printHelp() {
-        System.out.println("____________________________________________________________");
-        System.out.println("Commands:");
-        System.out.println(" - list: Show all tasks");
-        System.out.println(" - mark <task_number>: Mark a task as done");
-        System.out.println(" - unmark <task_number>: Unmark a task");
-        System.out.println(" - todo <description>: Add a new todo task");
-        System.out.println(" - deadline <description> /by <time>: Add a deadline task");
-        System.out.println(" - event <description> /from <start_time> /to <end_time>: Add an event task");
-        System.out.println(" - delete <task_number>: Remove a task");
-        System.out.println(" - bye: Exit the program");
-        System.out.println("____________________________________________________________");
+    public String readCommand() {
+        return scanner.nextLine();
     }
 
-    // List task
-    private static void listTasks() {
-        System.out.println("____________________________________________________________");
-        if (tasks.isEmpty()) {
-            System.out.println("Your task list is empty!");
-        } else {
-            System.out.println("Here are the tasks in your list:");
-            for (int i = 0; i < tasks.size(); i++) {
-                System.out.println((i + 1) + ". " + tasks.get(i));
-            }
-        }
+    public void showLine() {
         System.out.println("____________________________________________________________");
     }
 
-    private static void invalidMarkTask(String input) {
-        try {
-            int taskNumber = Integer.parseInt(input.split(" ")[1]);
-            if (taskNumber < 1 || taskNumber > tasks.size()) {
-                System.out.println("Invalid task number! Please enter a valid task number!");
-                return;
-            }
-            tasks.get(taskNumber - 1).markAsDone();
-            Storage.saveTasks(tasks, FILE_PATH);
-            System.out.println("Marked task as done: " + tasks.get(taskNumber - 1));
-        } catch (Exception e) {
-            System.out.println("Invalid format! Use: mark <task_number>");
-        }
+    public void showLoadingError() {
+        System.out.println("Error loading saved tasks.");
     }
 
-    private static void invalidUnmarkTask(String input) {
-        try {
-            int taskNumber = Integer.parseInt(input.split(" ")[1]);
-            if (taskNumber < 1 || taskNumber > tasks.size()) {
-                System.out.println("Invalid task number! Please enter a valid task number!");
-                return;
-            }
-            tasks.get(taskNumber - 1).markAsNotDone();
-            Storage.saveTasks(tasks, FILE_PATH);
-            System.out.println("Unmarked task as done: " + tasks.get(taskNumber - 1));
-        } catch (Exception e) {
-            System.out.println("Invalid format! Use: unmark <task_number>");
-        }
+    public void showError(String message) {
+        System.out.println("Error: " + message);
     }
+}
 
-    private static void invalidTodoTask(String input) {
-        String description = input.substring(5).trim();
-        if (description.isEmpty()) {
-            System.out.println("Todo description cannot be empty!");
-        } else {
-            addTask(new TodoTask(description));
-        }
+// Handles storage operations
+class Storage {
+    private final String filePath;
+
+    public Storage(String filePath) {
+        this.filePath = filePath;
     }
 
-    private static void invalidDeadlineTask(String input) {
-        String[] parts = input.substring(9).split(" /by ");
-        if (parts.length == 2) {
-            addTask(new DeadlineTask(parts[0], parts[1]));
-        } else {
-            System.out.println("Invalid format! Use: deadline <description> /by <time>");
+    public ArrayList<Task> load() throws IOException {
+        ArrayList<Task> tasks = new ArrayList<>();
+        File file = new File(filePath);
+        if (!file.exists()) return tasks;
+
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
+                tasks.add(Task.fromFileString(scanner.nextLine()));
+            }
         }
+        return tasks;
     }
 
-    private static void invalidEventTask(String input) {
-        String[] parts = input.substring(6).split(" /from | /to ", 3);
-        if (parts.length == 3) {
-            addTask(new EventTask(parts[0], parts[1], parts[2]));
-        } else {
-            System.out.println("Invalid format! Use: event <description> /from <start_time> /to <end_time>");
+    public void save(ArrayList<Task> tasks) throws IOException {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
+            for (Task task : tasks) {
+                writer.write(task.toFileString() + "\n");
+            }
         }
     }
+}
 
-    private static void invalidDeleteTask(String input) {
-        try {
-            int taskNumber = Integer.parseInt(input.split(" ")[1]);
-            deleteTask(taskNumber);
-        } catch (Exception e) {
-            System.out.println("Invalid format! Use: delete <task_number>");
-        }
+// Manages the task list
+class TaskList {
+    private final ArrayList<Task> tasks;
+
+    public TaskList() {
+        this.tasks = new ArrayList<>();
+    }
+
+    public TaskList(ArrayList<Task> tasks) {
+        this.tasks = tasks;
     }
 
-    // Add task
-    private static void addTask(Task task) {
+    public void addTask(Task task) {
         tasks.add(task);
-        Storage.saveTasks(tasks, FILE_PATH);
-        System.out.println("____________________________________________________________");
         System.out.println("Added: " + task);
-        System.out.println("Now you have " + tasks.size() + " tasks in the list.");
-        System.out.println("____________________________________________________________");
     }
 
-    // Mark task as done
-    private static void markTask(int taskNumber) {
-        if (taskNumber > 0 && taskNumber <= tasks.size()) {
-            tasks.get(taskNumber - 1).markAsDone();
-            System.out.println("____________________________________________________________");
-            System.out.println("Marked as done: " + tasks.get(taskNumber - 1));
-            System.out.println("____________________________________________________________");
-        } else {
+    public void deleteTask(int index) {
+        if (index < 1 || index > tasks.size()) {
             System.out.println("Invalid task number!");
+            return;
         }
+        Task removed = tasks.remove(index - 1);
+        System.out.println("Removed: " + removed);
     }
 
-    // Unmark task
-    private static void unmarkTask(int taskNumber) {
-        if (taskNumber > 0 && taskNumber <= tasks.size()) {
-            tasks.get(taskNumber - 1).markAsNotDone();
-            System.out.println("____________________________________________________________");
-            System.out.println("Unmarked: " + tasks.get(taskNumber - 1));
-            System.out.println("____________________________________________________________");
-        } else {
-            System.out.println("Invalid task number!");
+    public void listTasks() {
+        if (tasks.isEmpty()) {
+            System.out.println("Your task list is empty!");
+            return;
+        }
+        for (int i = 0; i < tasks.size(); i++) {
+            System.out.println((i + 1) + ". " + tasks.get(i));
         }
     }
 
-    // Delete task
-    private static void deleteTask(int taskNumber) {
-        if (taskNumber > 1 || taskNumber > tasks.size()) {
-            System.out.println("Invalid task number! Please enter a valid task number!");
-            return;
-        }
-            Task removedTask = tasks.remove(taskNumber - 1);
-            Storage.saveTasks(tasks, FILE_PATH);
-            System.out.println("____________________________________________________________");
-            System.out.println("Removed: " + removedTask);
-            System.out.println("Now you have " + tasks.size() + " tasks left.");
-            System.out.println("____________________________________________________________");
+    public void markTask(int index) {
+        tasks.get(index - 1).markAsDone();
+        System.out.println("Marked as done: " + tasks.get(index - 1));
+    }
+
+    public void unmarkTask(int index) {
+        tasks.get(index - 1).markAsNotDone();
+        System.out.println("Unmarked: " + tasks.get(index - 1));
+    }
+
+    public ArrayList<Task> getTasks() {
+        return tasks;
+    }
+}
+
+// Parses user input
+class Parser {
+    public static Command parse(String input) {
+        String[] parts = input.split(" ", 2);
+        String command = parts[0];
+        String args = parts.length > 1 ? parts[1] : "";
+
+        switch (command) {
+        case "list":
+            return new ListCommand();
+        case "mark":
+            return new MarkCommand(Integer.parseInt(args));
+        case "unmark":
+            return new UnmarkCommand(Integer.parseInt(args));
+        case "todo":
+            return new AddCommand(new TodoTask(args));
+        case "deadline":
+            String[] deadlineParts = args.split(" /by ");
+            return new AddCommand(new DeadlineTask(deadlineParts[0], deadlineParts[1]));
+        case "event":
+            String[] eventParts = args.split(" /from | /to ");
+            return new AddCommand(new EventTask(eventParts[0], eventParts[1], eventParts[2]));
+        case "delete":
+            return new DeleteCommand(Integer.parseInt(args));
+        case "bye":
+            return new ExitCommand();
+        case "help":
+            return new HelpCommand();
+        default:
+            throw new IllegalArgumentException("Invalid command! Type 'help' to see available commands.");
         }
+    }
 }
 
-class Storage {
-    public static void saveTasks(ArrayList<Task> tasks, String filePath) {
-        try {
-            File file = new File(filePath);
-            if (file.getParentFile() != null) {
-                file.getParentFile().mkdirs();
-            }
-            PrintWriter writer = new PrintWriter(file);
+// Abstract Command class
+abstract class Command {
+    public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws IOException;
 
-            for (Task task : tasks) {
-                writer.println(task.toFileString());
-            }
-            writer.close();
-        } catch (IOException e) {
-            System.out.println("Something went wrong while saving tasks! " + e.getMessage());
-        }
+    public boolean isExit() {
+        return false;
     }
+}
 
-    public static void loadTasks(ArrayList<Task> tasks, String filePath) {
-        File file = new File(filePath);
-        if (!file.exists()) {
-            return; // No file to load
-        } try {
-            Scanner scanner = new Scanner(file);
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                Task task = Task.fromFileString(line);
-                if (task != null) {
-                    tasks.add(task);
-                }
-            } scanner.close();
-        } catch (FileNotFoundException e) {
-            System.out.println("Something went wrong while loading tasks! " + e.getMessage());
-        }
+// Command Implementations
+class ListCommand extends Command {
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        tasks.listTasks();
+    }
+}
+
+class MarkCommand extends Command {
+    private final int index;
+
+    public MarkCommand(int index) {
+        this.index = index;
+    }
+
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        tasks.markTask(index);
+    }
+}
+
+class UnmarkCommand extends Command {
+    private final int index;
+
+    public UnmarkCommand(int index) {
+        this.index = index;
+    }
+
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        tasks.unmarkTask(index);
     }
 }
 
-// Base Task class
+class AddCommand extends Command {
+    private final Task task;
+
+    public AddCommand(Task task) {
+        this.task = task;
+    }
+
+    public void execute(TaskList tasks, Ui ui, Storage storage) throws IOException {
+        tasks.addTask(task);
+        storage.save(tasks.getTasks());
+    }
+}
+
+class DeleteCommand extends Command {
+    private final int index;
+
+    public DeleteCommand(int index) {
+        this.index = index;
+    }
+
+    public void execute(TaskList tasks, Ui ui, Storage storage) throws IOException {
+        tasks.deleteTask(index);
+        storage.save(tasks.getTasks());
+    }
+}
+
+class ExitCommand extends Command {
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        ui.showGoodbye();
+    }
+
+    public boolean isExit() {
+        return true;
+    }
+}
+
+class HelpCommand extends Command {
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        System.out.println("Available commands:");
+        System.out.println("  list - Show all tasks");
+        System.out.println("  todo [task] - Add a to-do");
+        System.out.println("  deadline [task] /by [date] - Add a deadline");
+        System.out.println("  event [task] /from [start] /to [end] - Add an event");
+        System.out.println("  mark [index] - Mark task as done");
+        System.out.println("  unmark [index] - Unmark task");
+        System.out.println("  delete [index] - Delete task");
+        System.out.println("  bye - Exit program");
+    }
+}
+
+// Abstract Task class
 abstract class Task {
     protected String description;
     protected boolean isDone;
@@ -250,48 +295,46 @@ public Task(String description) {
     }
 
     public void markAsDone() {
-        isDone = true;
+        this.isDone = true;
     }
 
     public void markAsNotDone() {
-        isDone = false;
+        this.isDone = false;
     }
 
-    public abstract String toFileString();
-
-    public static Task fromFileString(String fileString) {
-        String[] parts = fileString.split(" \\| ");
-        if (parts.length < 3) return null;
+    public String getStatusIcon() {
+        return (isDone ? "[X]" : "[ ]");
+    }
 
-        boolean isDone = parts[1].equals("1");
-        String description = parts[2];
-        Task task;
+    public abstract String toFileString();
 
+    public static Task fromFileString(String line) {
+        String[] parts = line.split(" \\| ");
         switch (parts[0]) {
         case "T":
-            task = new TodoTask(description);
-            break;
+            TodoTask todo = new TodoTask(parts[2]);
+            if (parts[1].equals("1")) todo.markAsDone();
+            return todo;
         case "D":
-            if (parts.length < 4) return null;
-            task = new DeadlineTask(description, parts[3]);
-            break;
+            DeadlineTask deadline = new DeadlineTask(parts[2], parts[3]);
+            if (parts[1].equals("1")) deadline.markAsDone();
+            return deadline;
         case "E":
-            if (parts.length < 5) return null;
-            task = new EventTask(description, parts[3], parts[4]);
-            break;
+            EventTask event = new EventTask(parts[2], parts[3], parts[4]);
+            if (parts[1].equals("1")) event.markAsDone();
+            return event;
         default:
-            return null;
+            throw new IllegalArgumentException("Invalid task type in file.");
         }
-        if (isDone) task.markAsDone();
-        return task;
     }
+
     @Override
     public String toString() {
-        return "[" + (isDone ? "X" : " ") + "] " + description;
+        return getStatusIcon() + " " + description;
     }
 }
 
-// Todo task
+// To-do task
 class TodoTask extends Task {
     public TodoTask(String description) {
         super(description);
@@ -301,11 +344,16 @@ public TodoTask(String description) {
     public String toFileString() {
         return "T | " + (isDone ? "1" : "0") + " | " + description;
     }
+
+    @Override
+    public String toString() {
+        return "[T] " + super.toString();
+    }
 }
 
 // Deadline task
 class DeadlineTask extends Task {
-    private final String by;
+    private String by;
 
     public DeadlineTask(String description, String by) {
         super(description);
@@ -316,11 +364,17 @@ public DeadlineTask(String description, String by) {
     public String toFileString() {
         return "D | " + (isDone ? "1" : "0") + " | " + description + " | " + by;
     }
+
+    @Override
+    public String toString() {
+        return "[D] " + super.toString() + " (by: " + by + ")";
+    }
 }
 
 // Event task
 class EventTask extends Task {
-    private final String from, to;
+    private String from;
+    private String to;
 
     public EventTask(String description, String from, String to) {
         super(description);
@@ -332,4 +386,10 @@ public EventTask(String description, String from, String to) {
     public String toFileString() {
         return "E | " + (isDone ? "1" : "0") + " | " + description + " | " + from + " | " + to;
     }
+
+    @Override
+    public String toString() {
+        return "[E] " + super.toString() + " (from: " + from + " to: " + to + ")";
+    }
 }
+

From 1f48830a50f33dcae65ca5ee3f186bfe76545cca Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 21:43:14 +0800
Subject: [PATCH 15/21] Find by keyword function added

---
 src/main/java/Daisy.java | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 05e0b198a..7cf449a54 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -111,7 +111,7 @@ public void save(ArrayList<Task> tasks) throws IOException {
 
 // Manages the task list
 class TaskList {
-    private final ArrayList<Task> tasks;
+    private ArrayList<Task> tasks;
 
     public TaskList() {
         this.tasks = new ArrayList<>();
@@ -126,6 +126,20 @@ public void addTask(Task task) {
         System.out.println("Added: " + task);
     }
 
+    public void findTask(String keyword) {
+        System.out.println("Here are the matching tasks in your list:");
+        int count = 0;
+        for (int i = 0; i < tasks.size(); i++) {
+            if (tasks.get(i).description.contains(keyword)) {
+                System.out.println((count + 1) + ". " + tasks.get(i));
+                count++;
+            }
+        }
+        if (count == 0) {
+            System.out.println("No matching tasks found.");
+        }
+    }
+
     public void deleteTask(int index) {
         if (index < 1 || index > tasks.size()) {
             System.out.println("Invalid task number!");
@@ -188,6 +202,8 @@ public static Command parse(String input) {
             return new ExitCommand();
         case "help":
             return new HelpCommand();
+        case "find":
+            return new FindCommand(args);
         default:
             throw new IllegalArgumentException("Invalid command! Type 'help' to see available commands.");
         }
@@ -280,10 +296,29 @@ public void execute(TaskList tasks, Ui ui, Storage storage) {
         System.out.println("  mark [index] - Mark task as done");
         System.out.println("  unmark [index] - Unmark task");
         System.out.println("  delete [index] - Delete task");
+        System.out.println("  find [index] - Find task");
         System.out.println("  bye - Exit program");
     }
 }
 
+class FindCommand extends Command {
+    private String keyword;
+
+    public FindCommand(String keyword) {
+        this.keyword = keyword;
+    }
+
+    @Override
+    public void execute(TaskList tasks, Ui ui, Storage storage) {
+        tasks.findTask(keyword);
+    }
+
+    @Override
+    public boolean isExit() {
+        return false;
+    }
+}
+
 // Abstract Task class
 abstract class Task {
     protected String description;

From d01a1e06c3cc0ce518f927a493273b0413d795bc Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 22:12:00 +0800
Subject: [PATCH 16/21] Added javadoc comments

---
 src/main/java/Daisy.java | 83 ++++++++++++++++++++++++++++++++++------
 1 file changed, 71 insertions(+), 12 deletions(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 7cf449a54..5c0aa36cc 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -2,12 +2,18 @@
 import java.util.ArrayList;
 import java.util.Scanner;
 
-// Main class
+// Main Daisy class
 public class Daisy {
     private Storage storage;
     private TaskList tasks;
     private Ui ui;
 
+    /**
+     * Constructor for Daisy
+     * Initializes the user interface (Ui), storage (Storage) and loads saved tasks
+     *
+     * @param filePath the file path to load and save tasks.
+     */
     public Daisy(String filePath) {
         ui = new Ui();
         storage = new Storage(filePath);
@@ -19,6 +25,9 @@ public Daisy(String filePath) {
         }
     }
 
+    /**
+     * Displays the welcome message and handles user input until the user chooses to exit ("bye")
+     */
     public void run() {
         ui.showWelcome();
         boolean isExit = false;
@@ -42,14 +51,20 @@ public static void main(String[] args) {
     }
 }
 
-// User interface handler
+// Ui for dealing with user input and output
 class Ui {
     private final Scanner scanner;
 
+    /**
+     * Initializes the scanner for reading user input
+     */
     public Ui() {
         scanner = new Scanner(System.in);
     }
 
+    /**
+     * Displays the welcome message
+     */
     public void showWelcome() {
         System.out.println("____________________________________________________________");
         System.out.println(" Hello! I'm Daisy 🌼");
@@ -58,6 +73,9 @@ public void showWelcome() {
         System.out.println("____________________________________________________________");
     }
 
+    /**
+     * Displays the goodbye message
+     */
     public void showGoodbye() {
         System.out.println(" Bye! Hope to see you again soon. 🌸");
     }
@@ -70,16 +88,23 @@ public void showLine() {
         System.out.println("____________________________________________________________");
     }
 
+    /**
+     * Displays an error message when loading tasks doesn't work
+     */
     public void showLoadingError() {
         System.out.println("Error loading saved tasks.");
     }
 
+    /**
+     * Displays an error message
+     *
+     * @param message the error message to display
+     */
     public void showError(String message) {
         System.out.println("Error: " + message);
     }
 }
 
-// Handles storage operations
 class Storage {
     private final String filePath;
 
@@ -87,6 +112,12 @@ public Storage(String filePath) {
         this.filePath = filePath;
     }
 
+    /**
+     * Loads tasks from the storage file
+     *
+     * @return list of tasks from the storage file
+     * @throws IOException if an I/O error occurs
+     */
     public ArrayList<Task> load() throws IOException {
         ArrayList<Task> tasks = new ArrayList<>();
         File file = new File(filePath);
@@ -100,6 +131,12 @@ public ArrayList<Task> load() throws IOException {
         return tasks;
     }
 
+    /**
+     * Saves the tasks to the storage file
+     *
+     * @param tasks the list of tasks to save
+     * @throws IOException if an I/O error occurs
+     */
     public void save(ArrayList<Task> tasks) throws IOException {
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
             for (Task task : tasks) {
@@ -109,7 +146,7 @@ public void save(ArrayList<Task> tasks) throws IOException {
     }
 }
 
-// Manages the task list
+// Manages the task list, including adding, deleting, marking, and listing tasks
 class TaskList {
     private ArrayList<Task> tasks;
 
@@ -121,11 +158,21 @@ public TaskList(ArrayList<Task> tasks) {
         this.tasks = tasks;
     }
 
+    /**
+     * Adds a task to the task list
+     *
+     * @param task the task to add
+     */
     public void addTask(Task task) {
         tasks.add(task);
         System.out.println("Added: " + task);
     }
 
+    /**
+     * Finds and displays tasks that match the provided keyword
+     *
+     * @param keyword the keyword to search for in tasks
+     */
     public void findTask(String keyword) {
         System.out.println("Here are the matching tasks in your list:");
         int count = 0;
@@ -174,7 +221,7 @@ public ArrayList<Task> getTasks() {
     }
 }
 
-// Parses user input
+// Parses ui and returns command
 class Parser {
     public static Command parse(String input) {
         String[] parts = input.split(" ", 2);
@@ -210,8 +257,15 @@ public static Command parse(String input) {
     }
 }
 
-// Abstract Command class
 abstract class Command {
+    /**
+     * Excecutes the command
+     *
+     * @param tasks the task list
+     * @param ui the user interface
+     * @param storage the storage to save the tasks
+     * @throws IOException if an error occurs during I/O operations
+     */
     public abstract void execute(TaskList tasks, Ui ui, Storage storage) throws IOException;
 
     public boolean isExit() {
@@ -219,7 +273,6 @@ public boolean isExit() {
     }
 }
 
-// Command Implementations
 class ListCommand extends Command {
     public void execute(TaskList tasks, Ui ui, Storage storage) {
         tasks.listTasks();
@@ -319,7 +372,6 @@ public boolean isExit() {
     }
 }
 
-// Abstract Task class
 abstract class Task {
     protected String description;
     protected boolean isDone;
@@ -337,12 +389,23 @@ public void markAsNotDone() {
         this.isDone = false;
     }
 
+    /**
+     * Returns the status of the task
+     *
+     * @return "[X]" if done, "[ ]" if not done
+     */
     public String getStatusIcon() {
         return (isDone ? "[X]" : "[ ]");
     }
 
+    /**
+     * Saving the task to a file
+     */
     public abstract String toFileString();
 
+    /**
+     * Creating a task from a file.
+     */
     public static Task fromFileString(String line) {
         String[] parts = line.split(" \\| ");
         switch (parts[0]) {
@@ -369,7 +432,6 @@ public String toString() {
     }
 }
 
-// To-do task
 class TodoTask extends Task {
     public TodoTask(String description) {
         super(description);
@@ -386,7 +448,6 @@ public String toString() {
     }
 }
 
-// Deadline task
 class DeadlineTask extends Task {
     private String by;
 
@@ -406,7 +467,6 @@ public String toString() {
     }
 }
 
-// Event task
 class EventTask extends Task {
     private String from;
     private String to;
@@ -427,4 +487,3 @@ public String toString() {
         return "[E] " + super.toString() + " (from: " + from + " to: " + to + ")";
     }
 }
-

From 75c989e4a2e1f570b76658d14e737cf8ef4e5148 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 23:11:11 +0800
Subject: [PATCH 17/21] Update course website

---
 docs/README.md | 145 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 131 insertions(+), 14 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 47b9f984f..808456eda 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,30 +1,147 @@
-# Duke User Guide
+# Daisy 🌼User Guide
 
-// Update the title above to match the actual product name
+Hello! I'm Daisy 🌼 a flowery chatbot eager to help you bloom into a more organized and productive you! From tracking tasks to keeping you on top of your game, I'm here to make your life a little more fragrant and a lot more colourful. Let's get started!
 
-// Product screenshot goes here
+## Help: shows command formats
 
-// Product intro goes here
+Displays all possible commands and their correct format
 
-## Adding deadlines
+Format: `help`
+Example: `help`
+Example output:
 
-// Describe the action and its outcome.
+```
+Available commands:
+  list - Show all tasks
+  todo [task] - Add a to-do
+  deadline [task] /by [date] - Add a deadline
+  event [task] /from [start] /to [end] - Add an event
+  mark [index] - Mark task as done
+  unmark [index] - Unmark task
+  delete [index] - Delete task
+  find [keyword] - Find task
+  bye - Exit program
+```
+
+## List: shows all tasks
+
+Displays all tasks currently in the list
+
+Format: `help`
+Example: `list`
+Example output:
+
+```
+1. [D] [ ] ip (by: midnight)
+2. [E] [ ] birthday (from: monday to: tuesday)
+3. [T] [ ] sleep
+4. [E] [X] wedding (from: 6 to: 7)
+5. [D] [ ] assignment 1 (by: august 5)
+```
+
+## Todo: adding a to-do task
+
+Adds a to-do task to the list
+
+Format: `todo [task]`
+Example: `todo laundry`
+Example output:
+
+```
+Added: [T] [ ] laundry
+```
+
+## Deadline: adding a deadline
+
+Adds a deadline task to the list
+
+Format: `deadline [task] /by [date]`
+Example: `deadline project1 /by friday 23:59`
+
+Example output:
+
+```
+Added: [D] [ ] project1 (by: friday 23:59)
+```
+
+## Event: adding an event
+
+Adds an event task to the list
+
+Format: `event [task] /from [start] /to [end]`
+Example: `event conference /from monday 1PM /to monday 7PM`
+
+Example output:
+
+```
+Added: [E] [ ] conference (from: monday 1PM to: monday 7PM)
+```
+
+## Mark: marking a task as done
+
+Marks a task as done
+
+Format: `mark [index]`
+Example: `mark 5`
+
+Example output:
+
+```
+Marked as done: [E] [X] wedding (from: 6 to: 7)
+```
+
+## Unmark: unmarking a task as done
 
-// Give examples of usage
+Unmarks a task, if a task turns out to be incomplete
 
-Example: `keyword (optional arguments)`
+Format: `unmark [index]`
+Example: `unmark 5`
 
-// A description of the expected outcome goes here
+Example output:
 
 ```
-expected output
+Unmarked: [E] [] wedding (from: 6 to: 7)
 ```
 
-## Feature ABC
+## Delete: delete a task
+
+Deletes a task from the list
+
+Format: `delete [index]`
+Example: `delete 5`
 
-// Feature details
+Example output:
+
+```
+Removed: [E] [ ] wedding (from: 6 to: 7)
+```
 
+## find: find a task
+
+Searches for tasks that have a given keyword in their description
+
+Format: `find [keyword]`
+Example: `find day`
+
+Example output:
+
+```
+Here are the matching tasks in your list:
+1. [E] [ ] birthday (from: monday to: tuesday)
+2. [E] [ ] holiday (from: today. to: tomorrow)
+```
+
+## bye: exit program
+
+Closes the program
+
+Format: `bye`
+Example: `bye`
+
+Example output:
+
+```
+ Bye! Hope to see you again soon. 🌸
+```
 
-## Feature XYZ
 
-// Feature details
\ No newline at end of file

From 37ca356964c1539a13d6c85f971292985972e4a9 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 23:34:34 +0800
Subject: [PATCH 18/21] Update responses

---
 docs/README.md           | 16 ++++++++--------
 src/main/java/Daisy.java | 36 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 808456eda..72e459c93 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,7 +11,7 @@ Example: `help`
 Example output:
 
 ```
-Available commands:
+Of course, I'm happy to help! Here's all the available commands:
   list - Show all tasks
   todo [task] - Add a to-do
   deadline [task] /by [date] - Add a deadline
@@ -48,7 +48,7 @@ Example: `todo laundry`
 Example output:
 
 ```
-Added: [T] [ ] laundry
+Woww that sounds delightful! I will add:: [T] [ ] laundry
 ```
 
 ## Deadline: adding a deadline
@@ -61,7 +61,7 @@ Example: `deadline project1 /by friday 23:59`
 Example output:
 
 ```
-Added: [D] [ ] project1 (by: friday 23:59)
+Woww that sounds delightful! I will add:: [D] [ ] project1 (by: friday 23:59)
 ```
 
 ## Event: adding an event
@@ -74,7 +74,7 @@ Example: `event conference /from monday 1PM /to monday 7PM`
 Example output:
 
 ```
-Added: [E] [ ] conference (from: monday 1PM to: monday 7PM)
+Woww that sounds delightful! I will add:: [E] [ ] conference (from: monday 1PM to: monday 7PM)
 ```
 
 ## Mark: marking a task as done
@@ -87,7 +87,7 @@ Example: `mark 5`
 Example output:
 
 ```
-Marked as done: [E] [X] wedding (from: 6 to: 7)
+Well done! I've marked this task as done: [E] [X] wedding (from: 6 to: 7)
 ```
 
 ## Unmark: unmarking a task as done
@@ -100,7 +100,7 @@ Example: `unmark 5`
 Example output:
 
 ```
-Unmarked: [E] [] wedding (from: 6 to: 7)
+Uhoh are we getting ahead of ourselves? I've unmarked: [E] [] wedding (from: 6 to: 7)
 ```
 
 ## Delete: delete a task
@@ -113,7 +113,7 @@ Example: `delete 5`
 Example output:
 
 ```
-Removed: [E] [ ] wedding (from: 6 to: 7)
+Let's remove this: [E] [ ] wedding (from: 6 to: 7)
 ```
 
 ## find: find a task
@@ -126,7 +126,7 @@ Example: `find day`
 Example output:
 
 ```
-Here are the matching tasks in your list:
+I see colours everywhere! Here are the matching tasks in your list:
 1. [E] [ ] birthday (from: monday to: tuesday)
 2. [E] [ ] holiday (from: today. to: tomorrow)
 ```
diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 5c0aa36cc..51f9fcb84 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -68,8 +68,8 @@ public Ui() {
     public void showWelcome() {
         System.out.println("____________________________________________________________");
         System.out.println(" Hello! I'm Daisy 🌼");
-        System.out.println(" What can I do for you?");
-        System.out.println(" Type 'help' to see available commands.");
+        System.out.println(" How can I help you today?");
+        System.out.println(" Type 'help' to see all of my petals (possible commands).");
         System.out.println("____________________________________________________________");
     }
 
@@ -77,7 +77,7 @@ public void showWelcome() {
      * Displays the goodbye message
      */
     public void showGoodbye() {
-        System.out.println(" Bye! Hope to see you again soon. 🌸");
+        System.out.println(" Byebye! I'll be photosynthesizing in the corner but I hope to see you bloom again soon! 🌸");
     }
 
     public String readCommand() {
@@ -92,7 +92,7 @@ public void showLine() {
      * Displays an error message when loading tasks doesn't work
      */
     public void showLoadingError() {
-        System.out.println("Error loading saved tasks.");
+        System.out.println("Oh no! There appears to be an error loading saved tasks. Please try again!");
     }
 
     /**
@@ -101,7 +101,7 @@ public void showLoadingError() {
      * @param message the error message to display
      */
     public void showError(String message) {
-        System.out.println("Error: " + message);
+        System.out.println("Oh no! There appears to be an error visiting us. This is its name: " + message);
     }
 }
 
@@ -146,7 +146,7 @@ public void save(ArrayList<Task> tasks) throws IOException {
     }
 }
 
-// Manages the task list, including adding, deleting, marking, and listing tasks
+// Manages the task list
 class TaskList {
     private ArrayList<Task> tasks;
 
@@ -165,7 +165,7 @@ public TaskList(ArrayList<Task> tasks) {
      */
     public void addTask(Task task) {
         tasks.add(task);
-        System.out.println("Added: " + task);
+        System.out.println("Woww that sounds delightful! I will add: " + task);
     }
 
     /**
@@ -174,7 +174,7 @@ public void addTask(Task task) {
      * @param keyword the keyword to search for in tasks
      */
     public void findTask(String keyword) {
-        System.out.println("Here are the matching tasks in your list:");
+        System.out.println("I see colours everywhere! Here are the matching tasks in your list:");
         int count = 0;
         for (int i = 0; i < tasks.size(); i++) {
             if (tasks.get(i).description.contains(keyword)) {
@@ -183,22 +183,22 @@ public void findTask(String keyword) {
             }
         }
         if (count == 0) {
-            System.out.println("No matching tasks found.");
+            System.out.println("Oh no! I couldn't find any matching tasks. Please refer to the 'list' function instead.");
         }
     }
 
     public void deleteTask(int index) {
         if (index < 1 || index > tasks.size()) {
-            System.out.println("Invalid task number!");
+            System.out.println("Oh no! This is an invalid task number! Please look at the 'list'.");
             return;
         }
         Task removed = tasks.remove(index - 1);
-        System.out.println("Removed: " + removed);
+        System.out.println("Let's remove this: " + removed);
     }
 
     public void listTasks() {
         if (tasks.isEmpty()) {
-            System.out.println("Your task list is empty!");
+            System.out.println("Your task list is empty! Time to fill it up with lots of fun activities :)");
             return;
         }
         for (int i = 0; i < tasks.size(); i++) {
@@ -208,12 +208,12 @@ public void listTasks() {
 
     public void markTask(int index) {
         tasks.get(index - 1).markAsDone();
-        System.out.println("Marked as done: " + tasks.get(index - 1));
+        System.out.println("Well done! I've marked this task as done: " + tasks.get(index - 1));
     }
 
     public void unmarkTask(int index) {
         tasks.get(index - 1).markAsNotDone();
-        System.out.println("Unmarked: " + tasks.get(index - 1));
+        System.out.println("Uhoh are we getting ahead of ourselves? I've unmarked: " + tasks.get(index - 1));
     }
 
     public ArrayList<Task> getTasks() {
@@ -252,7 +252,7 @@ public static Command parse(String input) {
         case "find":
             return new FindCommand(args);
         default:
-            throw new IllegalArgumentException("Invalid command! Type 'help' to see available commands.");
+            throw new IllegalArgumentException("Oh no! This is an invalid command! Use the 'help' command to see all possibilities.");
         }
     }
 }
@@ -341,7 +341,7 @@ public boolean isExit() {
 
 class HelpCommand extends Command {
     public void execute(TaskList tasks, Ui ui, Storage storage) {
-        System.out.println("Available commands:");
+        System.out.println("Of course, I'm happy to help! Here's all the available commands:");
         System.out.println("  list - Show all tasks");
         System.out.println("  todo [task] - Add a to-do");
         System.out.println("  deadline [task] /by [date] - Add a deadline");
@@ -349,7 +349,7 @@ public void execute(TaskList tasks, Ui ui, Storage storage) {
         System.out.println("  mark [index] - Mark task as done");
         System.out.println("  unmark [index] - Unmark task");
         System.out.println("  delete [index] - Delete task");
-        System.out.println("  find [index] - Find task");
+        System.out.println("  find [keyword] - Find task");
         System.out.println("  bye - Exit program");
     }
 }
@@ -422,7 +422,7 @@ public static Task fromFileString(String line) {
             if (parts[1].equals("1")) event.markAsDone();
             return event;
         default:
-            throw new IllegalArgumentException("Invalid task type in file.");
+            throw new IllegalArgumentException("Oh no! There is an invalid task type in the file. Please check the file for more information.");
         }
     }
 

From bbdbfeb78a793644458b5a84b889616e3dab4ed5 Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 23:38:42 +0800
Subject: [PATCH 19/21] Update README.md

---
 docs/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index 72e459c93..0bf5d18ee 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -141,7 +141,10 @@ Example: `bye`
 Example output:
 
 ```
- Bye! Hope to see you again soon. 🌸
+ Byebye! I'll be photosynthesizing in the corner but I hope to see you bloom again soon! 🌸
 ```
 
+## save and store data
+
+Tasks are saved automatically after any changes to the list. It is saved as a text file in `[JAR file location]/data/daisy.txt`.
 

From 48d0c6b2c9851fe7b68adce1600fe70a2a63165a Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 23:45:16 +0800
Subject: [PATCH 20/21] error fixed

---
 src/main/java/Daisy.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/Daisy.java b/src/main/java/Daisy.java
index 51f9fcb84..b67c6ca09 100644
--- a/src/main/java/Daisy.java
+++ b/src/main/java/Daisy.java
@@ -121,7 +121,11 @@ public Storage(String filePath) {
     public ArrayList<Task> load() throws IOException {
         ArrayList<Task> tasks = new ArrayList<>();
         File file = new File(filePath);
-        if (!file.exists()) return tasks;
+        if (!file.exists()) {
+            file.getParentFile().mkdirs();
+            file.createNewFile();
+            return tasks;
+        }
 
         try (Scanner scanner = new Scanner(file)) {
             while (scanner.hasNextLine()) {

From a445372a6f11dce968cd45e7aa6ae1381ceeef1c Mon Sep 17 00:00:00 2001
From: Rozalie Smit <rozaliesmit@gmail.com>
Date: Fri, 14 Mar 2025 23:49:14 +0800
Subject: [PATCH 21/21] jar file updated

---
 data/daisy.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 data/daisy.txt

diff --git a/data/daisy.txt b/data/daisy.txt
new file mode 100644
index 000000000..72115e8be
--- /dev/null
+++ b/data/daisy.txt
@@ -0,0 +1,10 @@
+D | 0 | ip | midnight
+E | 0 | birthday | monday | tuesday
+E | 0 | holiday | today. | tomorrow
+T | 0 | sleep
+D | 0 | assignment 1 | august 5
+D | 0 | project1 | friday 23:59
+E | 0 | conference | monday 1PM | monday 7PM
+T | 0 | dream
+T | 0 | gardening
+D | 0 | dance | tomorrow