diff --git a/docs/UserGuide.md b/docs/UserGuide.md
index 8655b6ad241..10b8a9c4572 100644
--- a/docs/UserGuide.md
+++ b/docs/UserGuide.md
@@ -3,29 +3,85 @@ layout: page
title: User Guide
---
-Do you have trouble managing contacts?
+Are you a School of Computing (SoC) Computing Club event planner juggling numerous tasks and contacts for your upcoming events?
-Don't worry, CoordiMate is here to help!
+Managing everything efficiently just got easier with CoordiMate!
-CoordiMate is a **desktop app for event planners**. It helps you **manage your contacts and tasks** for your events, so that you can focus on the event itself.
+CoordiMate is your go-to **desktop app** designed specifically for **SoC Computing Club event planners** to help you **manage your contacts and tasks** for your events, so that you can focus on the event itself.
-CoordiMate is **optimized for use via a Command Line Interface (CLI)** while still having the benefits of a Graphical User Interface (GUI).
+And here's the best part – while it's perfect for members of SoC Computing Club, **event planners of all kinds** can benefit from CoordiMate's powerful features too!
-If you can type fast, CoordiMate can help you get your contact management tasks done **faster than traditional GUI apps**.
+
Why choose CoordiMate?
-This user guide contains all the information you need to get started with CoordiMate.
+1. **User-Friendly Command Line Interface (CLI)**: CoordiMate is optimized for use via a CLI, combining all the benefits of a Graphical User Interface (GUI) with the efficiency of a CLI.
- Table of Contents
-* Table of Contents
+2. **Speedy Navigation**: If you're a fast typist, CoordiMate will help you complete your contact and tasks management faster than traditional GUI apps, maximising your productivity.
+
+Don't let the stress of contact and task management hinder your event planning creativity.
+
+Let **CoordiMate** take care of the details, while you craft extraordinary events with confidence.
+
+## Using This Guide
+
+This document will guide you on the various features of CoordiMate and how to use them.
+
+If you are a new user, we recommend that you read this guide starting from the [Quick Start](#quick-start) section.
+
+If you are an experienced user, you can use the [Table of Contents](#table-of-contents) below to quickly locate the relevant section. Alternatively, you can jump to the [Command Summary](#command-summary) section for an overview of the command syntax.
+
+Here are some annotations used in this guide:
+
+{% include admonition.html type="danger" title="Danger" body="
+
+Be careful when performing these operations as they can lead to data loss.
+
+" %}
+
+{% include admonition.html type="warning" title="Warning" body="
+
+Take note of these as they can cause unexpected behaviour when using CoordiMate.
+
+" %}
+
+{% include admonition.html type="note" title="Note" body="
+
+Contains useful information to help you use CoordiMate better.
+
+" %}
+
+{% include admonition.html type="question" title="Question" body="
+
+Answers to frequently asked questions about CoordiMate.
+
+" %}
+
+{% include admonition.html type="bug" title="Known Issue" body="
+
+Known issues that you may face when using CoordiMate and how to resolve them.
+
+" %}
+
+Throughout this guide, you will see different text styles that are used to highlight important information.
+
+- Text in blue are links which you can click on to jump to the relevant section.
+- `Text with light blue background` are commands or file names which are used for CoordiMate.
+
+---
+
+
+
+## Table of Contents
+
+- Table of Contents
{:toc}
---
-## Quick start
+## Quick Start
-1. Ensure you have Java `11` or above installed in your Computer.
+1. Ensure you have Java `11` or above installed in your computer.
2. Download the latest `CoordiMate.jar` from [here](https://github.com/AY2324S1-CS2103T-T10-2/tp/releases).
@@ -33,27 +89,28 @@ This user guide contains all the information you need to get started with Coordi
4. Open a command terminal, `cd` into the folder you put `CoordiMate.jar` in, and use the `java -jar CoordiMate.jar` command to start CoordiMate.
- A GUI similar to the below picture should appear in a few seconds. Note how the app contains some sample data.
+ A GUI similar to the below screenshot should appear in a few seconds. Note how the app contains some sample data.
![Ui](images/Ui.png)
-5. Type the command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will open the help window.
+5. Type the command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will open the help window.
+
Some example commands you can try:
- * `listPerson` : Lists all persons.
+ - `listPerson` : Lists all persons.
- * `addPerson n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01` : Adds a new contact named `John Doe` with the specified details.
+ - `addPerson n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01` : Adds a new contact named `John Doe` with the specified details.
- * `deletePerson 3` : Deletes the 3rd contact shown in the current contact list.
+ - `deletePerson 3` : Deletes the 3rd contact shown in the current contact list.
- * `listTask` : Lists all tasks.
+ - `findTask caterer` : Finds all tasks with the word `caterer` in their title or note.
- * `addTask t/Get Flowers n/Wedding Anniversary` : Adds a task titled `Get Flowers` with note `Wedding Anniversary` to the task list.
+ - `listTask` : Lists all tasks.
- * `markTask 1` : Marks the 1st task shown in the current task list as done.
+ - `addTask T/Get Flowers n/Wedding Anniversary` : Adds a task titled `Get Flowers` with note `Wedding Anniversary` to the task list.
- * `findTask Get` : Finds all tasks with the word `Get` in their title or note.
+ - `markTask 1` : Marks the 1st task shown in the current task list as done.
- * `exit` : Exits the app.
+ - `exit` : Exits the app.
6. Refer to the [Usage](#usage) section below for details of each command.
@@ -63,18 +120,27 @@ This user guide contains all the information you need to get started with Coordi
## Features
-1. Create, Read, Update, Delete (CRUD) Person
-2. Find Person
-3. CRUD Task
-4. Find Task
-5. Automatic saving and loading of data from save file
- 1. CoordiMate automatically saves its data as a JSON file located at `[JAR file location]/data/CoordiMate.json`.
- 2. There is no need to save manually.
- 3. On startup, CoordiMate will automatically load existing data (if any) from the JSON file.
-6. Editable file format
- 1. Advanced users are welcome to update data directly by editing that data file.
-
-{% include admonition.html type="danger" title="Potentially Dangerous Operation!" body="
+1. **Easy Management of People**:
+ - Seamlessly create, update, and delete person records. CoordiMate ensures your contact list is always up-to-date, putting people at the heart of your event planning.
+2. **Quick Person Search**:
+ - Find specific individuals effortlessly. No more digging through piles of data. With CoordiMate, finding the right person is just a search away, making your interactions more personal and meaningful.
+3. **Effortless Task Control**:
+ - Manage tasks without the fuss. CoordiMate's intuitive interface lets you handle tasks with ease. From creation to completion, stay in control of every event detail.
+4. **Simplified Task Tracking**:
+ - Easily locate tasks based on your criteria. CoordiMate streamlines your search, ensuring you stay organized and focused on tasks that matter most to you and your attendees.
+5. **Hassle-Free Data Handling**:
+ - Automatic Data Management:
+ - CoordiMate takes care of saving and loading data for you. No need to worry about manual saves; your information is secure and ready whenever you are.
+ - Saved data safely as a JSON file located at `[JAR file location]/data/CoordiMate.json`.
+ - Startup Ready:
+ - Instantly pick up where you left off. CoordiMate loads your existing data upon startup, eliminating downtime and ensuring you're always in the loop.
+6. **Empowering User Control**:
+ - Editable File Format:
+ - For advanced users, CoordiMate offers complete data control. Tailor your event data directly by editing the data file, putting you in charge of your event management.
+
+With these user-centric features, CoordiMate empowers you to focus on what truly matters: creating exceptional events and nurturing valuable connections. Experience event planning made personal, efficient, and stress-free with CoordiMate!
+
+{% include admonition.html type="danger" title="Danger" body="
If your changes to the data file makes its format invalid, CoordiMate will discard all data and start with an empty data file at the next run.
@@ -88,7 +154,7 @@ Always make a backup before you edit!
## Usage
-{% include admonition.html type="info" title="Info: About Command Formats" body="
+{% include admonition.html type="note" title="Note" body="
-
@@ -130,7 +196,7 @@ Always make a backup before you edit!
" %}
-{% include admonition.html type="warning" title="Warning: Using the PDF version of this document" body="
+{% include admonition.html type="warning" title="Warning" body="
If you are using a PDF version of this document, be careful when copying and pasting commands that span multiple lines as space characters surrounding line-breaks may be omitted when copied over to the application.
@@ -138,80 +204,68 @@ If you are using a PDF version of this document, be careful when copying and pas
-### 1. Viewing help: `help`
+### Commands to Manage Persons
-You can access the help page at any time, ensuring that you will never be lost.
+#### 1. Adding a person: `addPerson`
-Format:
+You can add new individuals to your list such as clients, vendors, or friends.
-```
-help
-```
-
-Examples:
-
-- `help`
-
-Output:
-
-- Opens a window with a link to our user guide.
-
- ![help message](images/output/help_success.png)
-
-
-
-### 2. Adding a person: `addPerson`
-
-Add new people that you meet, be it new clients, vendors or friends.
-
-Format:
+
Format:
```
addPerson n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…
```
-{% include admonition.html type="info" title="A person can have any number of tags (including 0)." %}
+- Provide the full name of the individual using the `n/` prefix. This field is **mandatory**.
+- Provide the phone number with the `p/` prefix. This field is **mandatory**.
+- Provide the email address using the `e/` prefix. This field is **mandatory**.
+- Provide the address using the `a/` prefix. This field is **mandatory**.
+- Tag the person using the `t/` prefix. This field is **optional**.
+
+{% include admonition.html type="note" title="Note" body="
-Examples:
+A person can have any number of tags (including 0).
-- `addPerson n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-- `addPerson n/Betsy Crowe t/friend e/betsycrowe@example.com a/Newgate Prison p/1234567 t/criminal`
+" %}
-Output:
+Example:
+- `addPerson n/Charlotte Oliveiro p/93210283 e/charlotteo@example.com a/Blk 11 Ang Mo Kio Street 74, #11-04 t/flowers`
+ - Adds a person named `Charlotte Oliveiro` with phone number `93210283`, email `charlotteo@example.com`,
+ address `Blk 11 Ang Mo Kio Street 74, #11-04`, and tag `flowers`.
-![addPerson success](images/addPerson_success.png)
+ ![addPerson success](images/output/addPerson_success.png)
-Errors:
+Potential Error:
+- `addPerson`
+ - Negative example as the name, phone number, email address, and address are not specified.
-![addPerson error](images/error/addPerson_error.png)
+ ![addPerson error](images/error/addPerson_error.png)
-### 3. Listing all persons: `listPerson`
+#### 2. Listing all persons: `listPerson`
-Presents you with a comprehensive list of contacts in your contact list.
+You can view details of all your contacts.
-Format:
+Format:
```
listPerson
```
-Examples:
-
+Example:
- `listPerson`
+ - Shows a full list of all the contacts in your contact list.
-Output:
-
-![listPerson success](images/listPerson_success.png)
+ ![listPerson success](images/output/listPerson_success.png)
-### 4. Editing a person: `editPerson`
+#### 3. Editing a person: `editPerson`
Enables you to change the details or particulars of an existing contact in your contact list.
-Format:
+Format:
```
editPerson INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…
@@ -223,28 +277,40 @@ editPerson INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…
- When editing tags, the existing tags of the person will be removed i.e adding of tags is not cumulative.
- You can remove all the person’s tags by typing `t/` without specifying any tags after it.
-Examples:
+Examples:
+
+- `editPerson 1 p/91234567 e/johndoe@example.com`
+ - Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
+
+ ![editPerson success](images/output/editPerson_success.png)
+
+- `editPerson 2 n/Betsy Crower t/`
+ - Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
-- `editPerson 1 p/91234567 e/johndoe@example.com` Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
-- `editPerson 2 n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
+ ![editPerson success](images/output/editPerson_success_clearTag.png)
-Output:
+Potential Errors:
-![editPerson success](images/editPerson_success.png)
+- `editPerson`
+ - Negative example as no index or field is specified.
-Errors:
+ ![editPerson error](images/error/editPerson_error.png)
-- Incorrect parameters or command format
-![editPerson error](images/error/editPerson_error.png)
+- `editPerson 1`
+ - Negative example as no fields are specified.
-- Incorrect or missing index
-![editPerson wrongIndex](images/error/editPerson_wrongIndex.png)
+ ![editPerson error](images/error/editPerson_missingFields.png)
+
+- `editPerson 10 p/91234567 e/johndoe@example.com`
+ - Negative example as invalid index provided.
+
+ ![editPerson wrongIndex](images/error/editPerson_wrongIndex.png)
-### 5. Finding a specific person: `findPerson`
+#### 4. Finding a specific person: `findPerson`
-Type in a few keywords linked to a person's name, and the matching persons' details will be displayed on screen.
+Allows you to quickly find a specific person's details by their name.
{% include admonition.html type="note" title="Note" body="
@@ -253,7 +319,7 @@ To reset the Persons view, simply run the listPerson
command to lis
" %}
-Format:
+Format:
```
findPerson KEYWORD [MORE_KEYWORDS]…
@@ -262,43 +328,43 @@ findPerson KEYWORD [MORE_KEYWORDS]…
- At least one keyword is required to search.
- The search is case-insensitive. e.g `hans` will match `Hans`.
- The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans`.
-- Only the name is searched.
+- Only the **name** is searched.
- Only full words will be matched e.g. `Han` will not match `Hans`.
- Persons matching at least one keyword will be returned (i.e. `OR` search).
- e.g. `Hans Bo` will match `Hans Gruber`, `Bo Yang`.
-Examples:
-
-- `findPerson John` returns `john` and `John Doe`
-- `findPerson alex david` returns `Alex Yeoh`, `David Li`
-- Assuming `Jane` is not in your contacts list, `findPerson Jane` returns `0 Persons Listed`.
+Examples:
-Output:
+- `findPerson alex yu`
+ - Finds all persons whose names contains either `alex` or `yu`.
-- There are search outcomes to be displayed.
+ ![findPerson success with a list](images/output/findPerson_success.png)
-![findPerson success with a list](images/output/findPerson_success.png)
+- `findPerson David`
+ - No results are displayed as no person has a name that contains `David`.
+ ![findPerson success with zero results](images/output/findPerson_noResults.png)
-- There are no search outcomes to be displayed.
+Potential Error:
-![findPerson success with zero results](images/output/findPerson_noResults.png)
+- `findPerson`
+ - Negative example as no keywords are specified.
-Errors:
+ ![findPerson error](images/error/findPerson_error.png)
-- Incorrect number of parameters.
+
-![findPerson error](images/error/findPerson_error.png)
+#### 5. Deleting a person entry: `deletePerson`
-
+Allows you to remove an outdated person from your contact list with ease.
-### 6. Deleting a person entry: `deletePerson`
+{% include admonition.html type="danger" title="Danger" body="
-{% include admonition.html type="danger" title="Potentially Dangerous Operation!" body="This action is irreversible." %}
+This action is irreversible.
-Erase an outdated person from your contact list with ease.
+" %}
-Format:
+Format:
```
deletePerson INDEX
@@ -308,247 +374,266 @@ deletePerson INDEX
- The index refers to the index number shown in the displayed person list.
- The index **_must be a positive integer_** 1, 2, 3, …
-Examples:
+Examples:
+
+- `listPerson` followed by `deletePerson 2`
+ - Deletes the 2nd person in your contact list.
+
+ ![deletePerson_success_with_listPerson](images/output/deletePerson_success.png)
-- `listPerson` followed by `deletePerson 2` deletes the 2nd person in the contact list.
-- `findPerson Betsy` followed by `deletePerson 1` deletes the 1st person in the results of the `findPerson` command.
+- `findPerson Bernice` followed by `deletePerson 1`
+ - Deletes the 1st person in the results of the `findPerson` command.
-Output:
+ ![deletePerson_success_with_findPerson](images/output/deletePerson_success_filteredList.png)
-![deletePerson success](images/output/deletePerson_success.png)
+Potential Errors:
-Errors:
+- `deletePerson`
+ - Negative example as no index is specified.
-![deletePerson error](images/error/deletePerson_error.png)
+ ![deletePerson error_no_index](images/error/deletePerson_error.png)
+
+- `deletePerson 1000`
+ - Invalid index is provided.
+
+ ![deletePerson error_invalid_index](images/error/deletePerson_wrongIndex.png)
-### 7. Clearing all person entries: `deleteAllPerson`
+#### 6. Clearing all person entries: `deleteAllPerson`
-{% include admonition.html type="danger" title="Potentially Dangerous Operation!" body="
-CoordiMate will discard all Person data and start with an empty data file at the next run.
" %}
+Clears **all** contacts in your contact list.
-Clears all contacts in your contact list.
+{% include admonition.html type="danger" title="Danger" body="
-Format:
+This action is irreversible.
+
+" %}
+
+Format:
```
deleteAllPerson
```
-Examples:
+Example:
- `deleteAllPerson`
- - Deletes all persons in your contact list.
-
-Output:
+ - Deletes all persons in your contact list.
-- All persons in the contact list are deleted.
+ ![deleteAllPerson success](images/output/deleteAllPerson_success.png)
- ![deleteAllPerson success](images/deleteAllPerson_success.png)
+---
-### 8. Adding a task: `addTask`
+### Commands to Manage Tasks
+
+#### 7. Adding a task: `addTask`
Adds a task to your task list.
-Format:
+Format:
```
-addTask t/TITLE n/NOTE
+addTask T/TITLE n/NOTE [t/TAG]...
```
-Examples:
+Examples:
-- `addTask t/Get Flowers n/Wedding Anniversary`
-- `addTask t/Call Caterers n/Reunion Dinner`
+- `addTask T/Book rooms n/For day 2 t/orientation t/bookings`
+ - Adds a task titled `Book rooms` with note `For day 2` and tags `orientation` and `bookings`.
-Output:
+ ![addTask_success](images/output/addTask_success1.png)
-![addTask_success](images/output/addTask_success.png)
+- `addTask T/Call Caterers n/For 292 people t/orientation`
+ - Adds a task titled `Call Caterers` with note `For 292 people` and tag `orientation`.
-Errors:
+ ![addTask_success](images/output/addTask_success2.png)
-![addTask_error](images/error/addTask_error.png)
+Potential Errors:
+
+- `addTask T/Book rooms`
+ - Negative example as the note is not specified.
+
+ ![addTask_error](images/error/addTask_error.png)
-### 9. Listing all tasks: `listTask`
+#### 8. Listing all tasks: `listTask`
-Provides you with a complete list of tasks in your task list.
+You can view details of all your tasks.
-Format:
+Format:
```
listTask
```
-Examples:
-
+Examples:
- `listTask`
+ - Displays a complete list of all tasks in your task list.
-Output:
-
-![listTask_success](images/output/listTask_success.png)
+ ![listTask success](images/output/listTask_success.png)
-### 10. Editing a task: `editTask`
+#### 9. Editing a task: `editTask`
You can edit the details of a task in your task list.
-Format:
+Format:
```
-editTask INDEX [t/TITLE] [n/NOTE]
+editTask INDEX [T/TITLE] [n/NOTE] [t/TAG]...
```
-- Edits the task at the specified `INDEX`.
-- The index refers to the index number shown in the task list currently displayed.
-- Specify a new title with the `t/` prefix. This field is **optional**.
+- Edits the task at the specified `INDEX`. The index refers to the index number shown in the task list currently displayed.
+- Specify a new title with the `T/` prefix. This field is **optional**.
- Specify a new note with the `n/` prefix. This field is **optional**.
+- Specify new tags with the `t/` prefix. This field is **optional**.
+- At least one of the optional fields must be provided for the command to be valid.
-Examples:
+Examples:
-- `editTask 1 t/Call Caterer`
- - Edits the title of the 1st task to be `Call Caterer`.
-- `editTask 2 t/Book room n/By Friday`
- - Edits the title of the 2nd task to be `Book room` and the note to be `By Friday`.
-- `editTask`
- - Negative example as the index is not specified.
+- `editTask 1 T/Find Caterer`
+ - Edits the title of the 1st task to be `Find Caterer`.
-Output:
+ ![editTask_success](images/output/editTask_success1.png)
-- Title of task 1 is edited to `Call Caterer`.
-
- ![editTask_success](images/output/editTask_success1.png)
-
-- Title of task 2 is edited to `Book room` and note is edited to `By Friday`.
+- `editTask 2 T/Book room n/By Friday t/orientation`
+ - Edits the title of the 2nd task to be `Book room`, the note to be `By Friday`, and the tag to be `orientation`.
![editTask_success](images/output/editTask_success2.png)
-Errors:
+Potential Error:
-- Index is not specified.
+- `editTask`
+ - Negative example as the index is not specified.
![editTask_error](images/error/editTask_error.png)
-### 11. Finding a specific task: `findTask`
+#### 10. Finding a specific task: `findTask`
-You can locate tasks containing your specified keywords in their title and/or note.
+You can quickly locate tasks that contains your specified keywords in their title and/or note.
{% include admonition.html type="note" title="Note" body="
This command hides all Tasks that do not match the search criteria.
-To reset the Tasks view, simply run the listTasks
command to list all Tasks.
+To reset the Tasks view, simply run the listTask
command to list all Tasks.
" %}
-Format:
+Format:
```
findTask KEYWORD [MORE_KEYWORDS]…
```
- At least one keyword is required to search.
-- The search is case-insensitive. e.g `call` will match `Call`.
-- The order of the keywords does not matter. e.g. `Call Caterer` will match `Caterer Call`.
-- Both the title and note of a task is searched.
-- Only full words will be matched e.g. `Call` will not match `Calls`.
+- The search is case-insensitive. e.g `find` will match `Find`.
+- The order of the keywords does not matter. e.g. `Find Venue` will match `Venue Find`.
+- Both the **title and note** of a task are searched.
+- Only full words will be matched e.g. `Venue` will not match `Venues`.
- Tasks matching at least one keyword in either the title or the note will be returned (i.e. `OR` search).
- - e.g. `Call Wedding` will match `Call Hotel`, `Wedding Anniversary`.
+ - e.g. `Budget Venue` will match `Find Venue`, `Create Budget`.
-Examples:
+Examples:
-- `findTask Call Wedding`
- - Finds tasks with titles or notes containing either `Call` or `Wedding`.
-- `findTask Photography`
- - Finds tasks with titles or notes containing `Photography`.
-- `findTask`
- - Negative example as no keywords are specified.
+- `findTask Find Finale`
+ - Finds tasks with titles or notes containing either `Find` or `Finale`.
-Output:
-- Both tasks are displayed as Task 1 has the word `Call` in its title and Task 2 has the word `Wedding` in its note.
+ ![findTask_success](images/output/findTask_success.png)
- ![findTask_success](images/output/findTask_success.png)
+- `findTask Photography`
+ - No results are displayed as no task has a title or note that contains `Photography`.
-- There are no tasks to be displayed, as no Task has the word `Photography` in its title or note.
-
![findTask_noResults](images/output/findTask_noResults.png)
-Errors:
+Potential Error:
+
+- `findTask`
+ - Negative example as no keywords are specified.
-- No keywords are specified.
-
![findTask_error](images/error/findTask_error.png)
-### 12. Deleting a task entry: `deleteTask`
+#### 11. Deleting a task entry: `deleteTask`
-{% include admonition.html type="danger" title="Potentially Dangerous Operation!" body="This action is irreversible." %}
+Allows you to remove a task from your task list with ease.
-You can remove a task from your task list.
+{% include admonition.html type="danger" title="Danger" body="
+
+This action is irreversible.
+
+" %}
-Format:
+Format:
`deleteTask INDEX`
- Deletes the task at the specified `INDEX`.
- The index refers to the index number shown in the task list currently displayed.
-Examples:
+Examples:
-- `deleteTask 2`
- - Deletes the 2nd task in the task list.
-- `findTask Call` followed by `deleteTask 1`
- - Deletes the 1st task in the results of the `findTask` command.
+- `listTask` followed by `deleteTask 2`
+ - Deletes the 2nd task in your task list.
-Output:
+ ![deleteTask_success_with_listTask](images/output/deleteTask_success.png)
-- Deletes task 2.
+- `findTask caterer` followed by `deleteTask 1`
+ - Deletes the 1st task in the results of the `findTask` command.
- ![deleteTask_success](images/output/deleteTask_success1.png)
+ ![deleteTask_success_with_findTask](images/output/deleteTask_success_filteredList.png)
-Errors:
+Potential Errors:
-- Index specified is not available in the task list.
+- `deleteTask`
+ - Negative example as no index is specified.
- ![deleteTask_error](images/error/deleteTask_error1.png)
+ ![deleteTask error_no_index](images/error/deleteTask_error.png)
+
+- `deleteTask 1000`
+ - Invalid index is provided.
+
+ ![deleteTask error_invalid_index](images/error/deleteTask_wrongIndex.png)
-### 13. Clearing all task entries: `deleteAllTask`
+#### 12. Clearing all task entries: `deleteAllTask`
+
+Allows you to remove **all** entries from your task list.
-{% include admonition.html type="danger" title="Potentially Dangerous Operation!" body="
-CoordiMate will discard all Task data and start with an empty data file at the next run.
" %}
+{% include admonition.html type="danger" title="Danger" body="
-Allows you to remove all entries from your task list.
+This action is irreversible.
+
+" %}
-Format:
+Format:
```
deleteAllTask
```
-Examples:
+Example:
- `deleteAllTask`
+ - Deletes all tasks in your task list.
-Output:
-
-![deleteAllTask success](images/output/deleteAllTask_success.png)
+ ![deleteAllTask success](images/output/deleteAllTask_success.png)
-### 14. Marking a task as done: `markTask`
+#### 13. Marking a task as done: `markTask`
Allows you to indicate that a specific task as **completed**.
-Format:
+Format:
```
markTask INDEX
@@ -558,28 +643,42 @@ markTask INDEX
- The index refers to the index number shown in the displayed task list.
- The index **_must be a positive integer_** 1, 2, 3, …
-{% include admonition.html type="info" title="Tasks are marked as not done by default." %}
+{% include admonition.html type="note" title="Note" body="
+
+Tasks are marked as not done by default.
+
+" %}
+
+Examples:
-Examples:
+- `listTask` followed by `markTask 1`
+ - Marks the 1st task in the task list as **done**
-- `listTask` followed by `markTask 2` marks the 2nd task in the task list as **done**.
-- `findTask Call` followed by `markTask 1` marks the 1st task in the results of the `findTask` command as **done**.
+ ![markTask_success](images/output/markTask_success.png)
-Output:
+- `findTask budget` followed by `markTask 1`
+ - Marks the 1st task in the results of the `findTask` command as **done**
-![markTask_success](images/output/markTask_success.png)
+ ![markTask_success](images/output/markTask_success_filteredList.png)
-Errors:
+Potential Errors:
+- `markTask`
+ - Negative example as no index is given.
-![markTask_error](images/error/markTask_error.png)
+ ![markTask_error](images/error/markTask_error.png)
+
+- `markTask 10`
+ - Negative example as invalid index is given.
+
+ ![markTask_wrongIndex](images/error/markTask_wrongIndex.png)
-### 15. Marking a task as not done: `unmarkTask`
+#### 14. Marking a task as not done: `unmarkTask`
Allows you to indicate that a specific task as **not completed**.
-Format:
+Format:
```
unmarkTask INDEX
@@ -589,32 +688,455 @@ unmarkTask INDEX
- The index refers to the index number shown in the displayed task list.
- The index **_must be a positive integer_** 1, 2, 3, …
-{% include admonition.html type="info" title="Tasks are marked as not done by default." %}
+{% include admonition.html type="note" title="Note" body="
+
+Tasks are marked as not done by default.
+
+" %}
+
+Examples:
+
+- `listTask` followed by `unmarkTask 1`
+ - Marks the 1st task in the task list as **not done**
+
+ ![unmarkTask_success](images/output/unmarkTask_success.png)
+
+- `findTask budget` followed by `unmarkTask 1`
+ - marks the 1st task in the results of the `findTask` command as **not done**
+
+ ![unmarkTask_success](images/output/unmarkTask_success_filteredList.png)
+
+Potential Errors:
+
+- `unmarkTask`
+ - Negative example as no index is given.
+
+ ![unmarkTask_error](images/error/unmarkTask_error.png)
+
+- `unmarkTask 10`
+ - Negative example as invalid index is given.
+
+ ![markTask_wrongIndex](images/error/unmarkTask_wrongIndex.png)
+
+
+
+#### 15. Finding all tasks that are done: `findDone`
+
+You can filter the task list to find all the completed tasks, allowing you to review your accomplishments or track completed items with ease.
+
+{% include admonition.html type="note" title="Note" body="
+
+This command hides all Tasks that are not done.
+To reset the Tasks view, simply run the listTask
command to list all Tasks.
+
+" %}
+
+Format:
+
+```
+findDone
+```
+
+Examples:
+
+- `findDone`
+ - Tasks are displayed as they are marked as done.
+
+ ![findDone_success](images/output/findDone_success.png)
+
+- `findDone`
+ - There are no tasks to be displayed, as no Task is done.
+
+ ![findDone_noResults](images/output/findDone_noResults.png)
+
+
+
+#### 16. Finding all tasks that are not done: `findNotDone`
+
+You can filter the task list to find all the not completed tasks, allowing you to identify pending tasks, helping you focus on what needs to be done and prioritize your workflow effectively.
+
+{% include admonition.html type="note" title="Note" body="
+
+This command hides all Tasks that are not done.
+To reset the Tasks view, simply run the listTask
command to list all Tasks.
+
+" %}
+
+Format:
+
+```
+findNotDone
+```
+
+Examples:
+
+- `findNotDone`
+ - Tasks are displayed as they are marked as not done.
-Examples:
+ ![findNotDone_success](images/output/findNotDone_success.png)
-- `listTask` followed by `unmarkTask 2` marks the 2nd task in the task list as **not done**.
-- `findTask Call` followed by `unmarkTask 1` marks the 1st task in the results of the `findTask` command as **not done**.
+- `findNotDone`
+ - There are no tasks to be displayed, as no Task is not done.
-Output:
+ ![findNotDone_noResults](images/output/findNotDone_noResults.png)
-![unmarkTask_success](images/output/unmarkTask_success.png)
+
+
+#### 17. Deleting all tasks that are done: `deleteAllDone`
+
+You can easily clean up your task list by deleting all completed tasks, allowing you maintain an organized and clutter-free task management system.
+
+{% include admonition.html type="danger" title="Danger" body="
+
+This action is irreversible.
+
+" %}
+
+Format:
+
+```
+deleteAllDone
+```
-Errors:
+Examples:
-![unmarkTask_error](images/error/unmarkTask_error.png)
+- `deleteAllDone`
+ - All tasks that are marked as done are deleted.
+
+ ![deleteAllDone_success](images/output/deleteAllDone_success.png)
+
+Potential Errors:
+
+- `deleteAllDone`
+ - There are no tasks found that are marked as done.
+
+ ![deleteAllDone_error](images/error/deleteAllDone_error.png)
+
+---
-### 16. Exiting the program : `exit`
+### Commands to Manage Tags
+
+#### 18. Listing all tags: `listTag`
+
+Provides you with a complete list of tags you have used in your contact list and task list, and the number of times each tag has been used.
+
+The list is sorted by frequency of each tag in descending order.
+
+If two tags have the same frequency, the tags are sorted in the order as defined in the American Standard Code for Information Interchange (ASCII).
+
+{% include admonition.html type="note" title="Note" body="
+
+The American Standard Code for Information Interchange (ASCII) is a character encoding standard that is well understood by computers.
+In ASCII ordering, uppercase letters come before lowercase letters (A
comes before a
), unlike in alphabetical ordering where case does not matter.
+For more information, see ASCII on Wikipedia.
+
+" %}
+
+Format:
+
+```
+listTag
+```
+
+Example:
+
+- `listTag`
+ - Shows you a list of all tags used in your contact list and task list and the number of times each tag has been used.
+
+ ![listTag success](images/output/listTag_success.png)
+
+
+
+#### 19. Finding persons and tasks with any matching tag: `findTag`
+
+You can search for persons and tasks using any keywords that match their tags.
+
+{% include admonition.html type="note" title="Note" body="
+
+This command hides all persons and tasks that do not match the search criteria.
+To reset the Persons and Tasks view, simply run the listAll
command to list all persons and tasks.
+
+" %}
+
+Format:
+
+```
+findTag KEYWORD [MORE_KEYWORDS]...
+```
+
+- Finds the persons and tasks whose tags contain at least one of the specified `TAG`.
+- Specify a tag with the `KEYWORD` parameter. This field is **mandatory**.
+- Specify more tags to expand your search scope with the `MORE_KEYWORDS` parameter. This field is **optional**.
+- Shows results that contain at least one of the specified keywords.
+
+Examples:
+
+- `findTag orientation`
+ - Shows all persons and tasks containing the tag `orientation`.
+
+ ![findTag_success_2](images/output/findTag_success2.png)
+
+
+- `findTag catering orientation`
+ - Shows all persons and tasks containing any of the tags `catering` or `orientation`.
+
+ ![findTag_success_1](images/output/findTag_success1.png)
+
+Potential Error:
+
+- `findTag`
+ - An invalid command format. The application expects one or more keywords after `findTag`.
+
+ ![FindTag Example 2](images/error/findTag_error.png)
+
+
+
+#### 20. Finding persons and tasks with all matching tags: `findAllTag`
+
+You can search for persons and tasks using all keywords that match their tags.
+
+{% include admonition.html type="note" title="Note" body="
+
+This command hides all persons and tasks that do not match the search criteria.
+To reset the Persons and Tasks view, simply run the listAll
command to list all persons and tasks.
+
+" %}
+
+Format:
+
+```
+findAllTag KEYWORD [MORE_KEYWORDS]...
+```
+
+- Finds the persons and tasks whose tags contain at least one of the specified `KEYWORD`.
+- Specify a tag with the `KEYWORD` parameter. This field is **mandatory**.
+- Specify more tags to expand your search scope with the `MORE_KEYWORDS` parameter. This field is **optional**.
+- Shows only results that contain all keywords given.
+
+Examples:
+
+- `findAllTag orientation`
+ - Shows all persons and tasks containing the tag `catering`.
+
+ ![findAllTag_success_1](images/output/findAllTag_success1.png)
+
+- `findAllTag catering orientation`
+ - Shows all persons and tasks containing both the tags `catering` and `orientation`.
+
+ ![findAllTag_success_2](images/output/findAllTag_success2.png)
+
+Potential Error:
+
+- `findAllTag`
+ - An invalid command format. The application expects one or more keywords after `findAllTag`.
+
+ ![FindAllTag Example 2](images/error/findAllTag_error.png)
+
+
+
+#### 21. Adding tag(s) to a person: `addTagPerson`
+
+Enables you to add tag(s) to the existing list of tags of an existing contact in your contact list.
+
+Format:
+
+```
+addTagPerson INDEX [t/TAG]…
+```
+
+- Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list. The index **_must be a positive integer_** 1, 2, 3, …
+- At least one tag must be provided.
+- Existing list of tags will be updated after adding in the input tags.
+
+Examples:
+
+- `addTagPerson 1 t/friends t/expensive`
+ - Adds the tag `expensive` to the list of existing tags of the 1st person, while `friends` is mentioned in the output to have already been included in the list of existing tags.
+
+ ![addTagPerson success](images/output/addTagPerson_success.png)
+
+Potential Errors:
+
+- `addTagPerson`
+ - Negative example as no index or field is specified.
+
+ ![addTagPerson error_noParameters](images/error/addTagPerson_error_noParameters.png)
+
+- `addTagPerson 1`
+ - Negative example as no tag is specified.
+
+ ![addTagPerson error_validIndex](images/error/addTagPerson_error_validIndex.png)
+
+
+- `addTagPerson 1 t/`
+ - Negative example as no input is specified.
+
+ ![addTagPerson error_noInput](images/error/addTagPerson_error_noInput.png)
+
+- `addTagPerson 10 t/friends`
+ - Negative example as an invalid index is provided.
+
+ ![addTagPerson error_invalidIndex](images/error/addTagPerson_error_invalidIndex.png)
+
+
+
+#### 22. Adding tag(s) to a task: `addTagTask`
+
+Enables you to add tag(s) to the existing list of tags of an existing task in your task list.
+
+Format:
+
+```
+addTagTask INDEX [t/TAG]…
+```
+
+- Edits the task at the specified `INDEX`. The index refers to the index number shown in the displayed task list. The index **_must be a positive integer_** 1, 2, 3, …
+- At least one tag must be provided.
+- Existing list of tags will be updated after adding in the input tags.
+
+Examples:
+
+- `addTagTask 1 t/day1 t/day2`
+ - Adds the tag `day2` to the list of existing tags of the 1st task, while `day1` is mentioned in the output to have already been included in the list of existing tags.
+
+ ![addTagTask success](images/output/addTagTask_success.png)
+
+Potential Errors:
+
+- `addTagTask`
+ - Negative example as no index or field is specified.
+
+ ![addTagTask error_noParameters](images/error/addTagTask_error_noParameters.png)
+
+- `addTagTask 1`
+ - Negative example as no tag is specified.
+
+ ![addTagTask error_validIndex](images/error/addTagTask_error_validIndex.png)
+
+- `addTagTask 1 t/`
+ - Negative example as no input is specified.
+
+ ![addTagTask error_noInput](images/error/addTagTask_error_noInput.png)
+
+- `addTagTask 3 t/day1`
+ - Negative example as an invalid index is provided.
+
+ ![addTagTask error_invalidIndex](images/error/addTagTask_error_invalidIndex.png)
+
+
+
+#### 23. Deleting tag(s) from a person: `deleteTagPerson`
+
+You can remove tag(s) from a person in your contact list.
+
+Format:
+
+```
+deleteTagPerson INDEX t/TAG [t/MORE TAGS]…
+```
+
+- Removes specified tags from a person at the specified `INDEX`.
+- Specify one or more tags with the `t/` prefix before each tag. At least one tag must be provided.
+- Invalid tags will be ignored.
+
+Examples:
+
+- `deleteTagPerson 2 t/colleagues t/friends`
+ - Deletes the tags `colleagues` and `friends` from the 2nd person.
+
+ ![deleteTagPerson_success](images/output/deleteTagPerson_success.png)
+
+
+
+#### 24. Deleting tag(s) from a task: `deleteTagTask`
+
+You can remove tag(s) from a task in your task list.
+
+Format:
+
+```
+deleteTagTask INDEX t/TAG [t/MORE TAGS]…
+```
+
+- Removes specified tags from a task at the specified `INDEX`.
+- Specify one or more tags with the `t/` prefix before each tag. At least one tag must be provided.
+- Invalid tags will be ignored.
+
+Examples:
+
+- `deleteTagTask 2 t/class t/finance`
+ - Deletes the tags `class` and `finance` from the 2nd task.
+
+ ![deleteTagTask_success](images/output/deleteTagTask_success.png)
+
+---
+
+
+
+### General Commands
+
+#### 25. Viewing help: `help`
+
+You can view a link to access the user guide at any time, ensuring that you will never be lost.
+
+Format:
+
+```
+help
+```
+
+Example:
+
+- `help`
+ - Opens a window with a link to our user guide. You can copy the URL into a browser, or click on the "Open in browser" button to access the user guide directly.
+
+ ![help message](images/output/help_success.png)
+
+
+
+#### 26. Listing all persons and tasks: `listAll`
+
+You can list all persons and tasks in your contact list and task list at the same time.
+
+{% include admonition.html type="note" title="Note" body="
+
+You can use this command to quickly clear all filters after using the findPerson
, findTask
, findDone
, findNotDone
, or findTag
commands, instead of having to type the listPerson
and listTask
commands manually.
+
+" %}
+
+Format:
+
+```
+listAll
+```
+
+Example:
+- `listAll`
+ - Shows all the persons and tasks in your contact list and task list.
+
+ ![listAll success](images/output/listAll_success.png)
+
+
+
+#### 27. Exiting the program: `exit`
Once you are done with your work in CoordiMate, you can exit the program by typing a command.
-Format: `exit`
+Format:
-Output:
+```
+exit
+```
+
+Example:
+- `exit`
+ - CoordiMate exits and the program window closes.
-- CoordiMate exits and the program window closes.
+
+
+---
@@ -622,43 +1144,78 @@ Output:
{% include admonition.html type="question" title="How do I transfer my data to another computer?" body="
-Install the app in the other computer and overwrite the empty data file with your previous save file.
+1. Locate the save file at [CoordiMate JAR file location]/data/addressbook.json
on your current computer.
+2. Copy the save file to the same location on your new computer.
" %}
+
+
---
-## Known issues
+## Known Issues
-{% include admonition.html type="bug" title="Bug: The GUI will open off-screen if you switch between multiple screens." body="
+{% include admonition.html type="bug" title="CoordiMate does not open on the correct screen." body="
-Delete the preferences.json
file created by CoordiMate before running CoordiMate again.
+CoordiMate remembers the last screen it was on when it was closed. If that screen is no longer available when CoordiMate is opened, you will not be able to see the application window.
+
+To resolve this issue, you can simply delete the preferences.json
file that is in the same folder as the CoordiMate JAR file.
"%}
+
+
---
-## Command summary
+## Command Summary
+
+### Managing Persons
+
+ Action | Format | Example
+--------|--------|---------
+[**Add Person**](#1-adding-a-person-addperson)| `addPerson n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…` |`addPerson n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
+[**List All Person**](#2-listing-all-persons-listperson) | `listPerson` | `listPerson`
+[**Edit Person**](#3-editing-a-person-editperson) | `editPerson INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…` | `editPerson 1 p/91234567 e/johndoe@example.com`
+[**Find Person**](#4-finding-a-specific-person-findperson) | `findPerson KEYWORD [MORE_KEYWORDS]…` | `findPerson John`
+[**Delete Person**](#5-deleting-a-person-entry-deleteperson) | `deletePerson INDEX` | `deletePerson 1`
+[**Delete All Person**](#6-clearing-all-person-entries-deleteallperson) | `deleteAllPerson` | `deleteAllPerson`
+
+### Managing Tasks
+
+ Action | Format | Example
+--------|--------|---------
+[**Add Task**](#7-adding-a-task-addtask) | `addTask t/TITLE n/NOTE` | `addTask t/Get Flowers n/Wedding Anniversary`
+[**List All Task**](#8-listing-all-tasks-listtask) | `listTask` | `listTask`
+[**Edit Task**](#9-editing-a-task-edittask) | `editTask INDEX [t/TITLE] [n/NOTE]` | `editTask 1 t/Call Caterer`
+[**Find Task**](#10-finding-a-specific-task-findtask) | `findTask KEYWORD [MORE_KEYWORDS]…` | `findTask Call Wedding`
+[**Delete Task**](#11-deleting-a-task-entry-deletetask) | `deleteTask INDEX` | `deleteTask 1`
+[**Delete All Task**](#12-clearing-all-task-entries-deletealltask) | `deleteAllTask` | `deleteAllTask`
+[**Mark Task**](#13-marking-a-task-as-done-marktask) | `markTask INDEX` | `markTask 1`
+[**Unmark Task**](#14-marking-a-task-as-not-done-unmarktask) | `unmarkTask INDEX` | `unmarkTask 1`
+[**Find Done Task**](#15-finding-all-tasks-that-are-done-finddone) | `findDone` | `findDone`
+[**Find Not Done Task**](#16-finding-all-tasks-that-are-not-done-findnotdone) | `findNotDone` | `findNotDone`
+[**Delete All Done Task**](#17-deleting-all-tasks-that-are-done-deletealldone) | `deleteAllDone` | `deleteAllDone`
+
+### Managing Tags
+
+ Action | Format | Example
+--------|--------|---------
+[**List All Tags**](#18-listing-all-tags-listtag) | `listTag` | `listTag`
+[**Find Tags**](#19-finding-persons-and-tasks-with-any-matching-tag-findtag) | `findTag KEYWORD [MORE_KEYWORDS]...` | `findTag orientation`
+[**Find All Tags**](#20-finding-persons-and-tasks-with-all-matching-tags-findalltag) | `findAllTag KEYWORD [MORE_KEYWORDS]...` | `findAllTag orientation`
+[**Add Tag(s) to a Person**](#21-adding-tags-to-a-person-addtagperson) | `addTagPerson INDEX [t/TAG]…` | `addTagPerson 1 t/friends`
+[**Add Tag(s) to a Task**](#22-adding-tags-to-a-task-addtagtask) | `addTagTask INDEX [t/TAG]…` | `addTagTask 1 t/day1`
+[**Delete Tag(s) from Person**](#23-deleting-tags-from-a-person-deletetagperson) | `deleteTagPerson INDEX t/TAG [t/MORE TAGS]...` | `deleteTagPerson 1 t/catering`
+[**Delete Tag(s) from Task**](#24-deleting-tags-from-a-task-deletetagtask) | `deleteTagTask INDEX t/TAG [t/MORE TAGS]...` | `deleteTagTask 1 t/catering`
+
+### General
Action | Format | Example
---------|--------|----------
-[**View Help**](#1-viewing-help-help) | `help` | `help`
-[**Add Person**](#2-adding-a-person-addperson)|`addPerson n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`|`addPerson n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-[**List All Person**](#3-listing-all-persons-listperson) | `listPerson` | `listPerson`
-[**Edit Person**](#4-editing-a-person-editperson) | `editPerson INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…` | `editPerson 1 p/91234567 e/johndoe@example.com`
-[**Find Person**](#5-finding-a-specific-person-findperson) | `findPerson KEYWORD [MORE_KEYWORDS]…` | `findPerson John`
-[**Delete Person**](#6-deleting-a-person-entry-deleteperson) | `deletePerson INDEX` | `deletePerson 1`
-[**Delete All Person**](#7-clearing-all-person-entries-deleteallperson) | `deleteAllPerson` | `deleteAllPerson`
-[**Add Task**](#8-adding-a-task-addtask) | `addTask t/TITLE n/NOTE` | `addTask t/Get Flowers n/Wedding Anniversary`
-[**List All Task**](#9-listing-all-tasks-listtask) | `listTask` | `listTask`
-[**Edit Task**](#10-editing-a-task-edittask) | `editTask INDEX [t/TITLE] [n/NOTE]` | `editTask 1 t/Call Caterer`
-[**Find Task**](#11-finding-a-specific-task-findtask) | `findTask KEYWORD [MORE_KEYWORDS]…` | `findTask Call Wedding`
-[**Delete Task**](#12-deleting-a-task-entry-deletetask) | `deleteTask INDEX` | `deleteTask 1`
-[**Delete All Task**](#13-clearing-all-task-entries-deletealltask) | `deleteAllTask` | `deleteAllTask`
-[**Mark Task**](#14-marking-a-task-as-done-marktask) | `markTask INDEX` | `markTask 1`
-[**Unmark Task**](#15-marking-a-task-as-not-done-unmarktask) | `unmarkTask INDEX` | `unmarkTask 1`
-[**Exit**](#16-exiting-the-program--exit) | `exit` | `exit`
+--------|--------|---------
+[**View Help**](#25-viewing-help-help) | `help` | `help`
+[**List All Person and Task**](#26-listing-all-persons-and-tasks-listall) | `listAll` | `listAll`
+[**Exit**](#27-exiting-the-program-exit) | `exit` | `exit`
diff --git a/docs/_sass/admonition.scss b/docs/_sass/admonition.scss
index ed6c2ba4efc..47f9319905c 100644
--- a/docs/_sass/admonition.scss
+++ b/docs/_sass/admonition.scss
@@ -7,9 +7,9 @@ $primary-color: #eab308; // yellow-500
$primary-bgcolor: #fef9c3; // yellow-100
$admonitions:
//class (type), icon filename, icon/border color, title bg color
- ('note', 'pen-solid.svg', '#2563eb', '#dbeafe') // blue-600; blue-100
+ ('note', 'pen-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
('abstract', 'align-left-solid.svg', '#65a30d', '#ecfccb') // lime-600; lime-100
- ('info', 'info-circle-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
+ // ('info', 'info-circle-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
('tip', 'fire-solid.svg', '#14b8a6', '#cafdf8') // teal-500; turquoise-100?
('success', 'check-circle-solid.svg', '#059669', '#d1fae5') // emerald-600; emerald-100
('question', 'question-circle-solid.svg', '#4f46e5', '#e0e7ff') // indigo-600; indigo-100
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
index 272a594b9a3..ce01ffe8e01 100644
Binary files a/docs/images/Ui.png and b/docs/images/Ui.png differ
diff --git a/docs/images/addPerson_success.png b/docs/images/addPerson_success.png
deleted file mode 100644
index 6a2a93d1ee0..00000000000
Binary files a/docs/images/addPerson_success.png and /dev/null differ
diff --git a/docs/images/deleteAllPerson_success.png b/docs/images/deleteAllPerson_success.png
deleted file mode 100644
index fc4cd0ac99b..00000000000
Binary files a/docs/images/deleteAllPerson_success.png and /dev/null differ
diff --git a/docs/images/editPerson_success.png b/docs/images/editPerson_success.png
deleted file mode 100644
index 49860f7078f..00000000000
Binary files a/docs/images/editPerson_success.png and /dev/null differ
diff --git a/docs/images/error/addPerson_error.png b/docs/images/error/addPerson_error.png
index 108eb2d9379..b3a601b3f4c 100644
Binary files a/docs/images/error/addPerson_error.png and b/docs/images/error/addPerson_error.png differ
diff --git a/docs/images/error/addTagPerson_error_invalidIndex.jpg b/docs/images/error/addTagPerson_error_invalidIndex.jpg
new file mode 100644
index 00000000000..76eb6f374b8
Binary files /dev/null and b/docs/images/error/addTagPerson_error_invalidIndex.jpg differ
diff --git a/docs/images/error/addTagPerson_error_invalidIndex.png b/docs/images/error/addTagPerson_error_invalidIndex.png
new file mode 100644
index 00000000000..23aa2f3762a
Binary files /dev/null and b/docs/images/error/addTagPerson_error_invalidIndex.png differ
diff --git a/docs/images/error/addTagPerson_error_noInput.png b/docs/images/error/addTagPerson_error_noInput.png
new file mode 100644
index 00000000000..1e94a72e879
Binary files /dev/null and b/docs/images/error/addTagPerson_error_noInput.png differ
diff --git a/docs/images/error/addTagPerson_error_noParameters.jpg b/docs/images/error/addTagPerson_error_noParameters.jpg
new file mode 100644
index 00000000000..be44a193ba5
Binary files /dev/null and b/docs/images/error/addTagPerson_error_noParameters.jpg differ
diff --git a/docs/images/error/addTagPerson_error_noParameters.png b/docs/images/error/addTagPerson_error_noParameters.png
new file mode 100644
index 00000000000..1bab1bb9a26
Binary files /dev/null and b/docs/images/error/addTagPerson_error_noParameters.png differ
diff --git a/docs/images/error/addTagPerson_error_prefix.jpg b/docs/images/error/addTagPerson_error_prefix.jpg
new file mode 100644
index 00000000000..d4349c81fba
Binary files /dev/null and b/docs/images/error/addTagPerson_error_prefix.jpg differ
diff --git a/docs/images/error/addTagPerson_error_validIndex.jpg b/docs/images/error/addTagPerson_error_validIndex.jpg
new file mode 100644
index 00000000000..8b47ac0f272
Binary files /dev/null and b/docs/images/error/addTagPerson_error_validIndex.jpg differ
diff --git a/docs/images/error/addTagPerson_error_validIndex.png b/docs/images/error/addTagPerson_error_validIndex.png
new file mode 100644
index 00000000000..5ce1d65a247
Binary files /dev/null and b/docs/images/error/addTagPerson_error_validIndex.png differ
diff --git a/docs/images/error/addTagTask_error_invalidIndex.jpg b/docs/images/error/addTagTask_error_invalidIndex.jpg
new file mode 100644
index 00000000000..4b8b843ea79
Binary files /dev/null and b/docs/images/error/addTagTask_error_invalidIndex.jpg differ
diff --git a/docs/images/error/addTagTask_error_invalidIndex.png b/docs/images/error/addTagTask_error_invalidIndex.png
new file mode 100644
index 00000000000..7f064c7df93
Binary files /dev/null and b/docs/images/error/addTagTask_error_invalidIndex.png differ
diff --git a/docs/images/error/addTagTask_error_noInput.png b/docs/images/error/addTagTask_error_noInput.png
new file mode 100644
index 00000000000..cd2cb66aa01
Binary files /dev/null and b/docs/images/error/addTagTask_error_noInput.png differ
diff --git a/docs/images/error/addTagTask_error_noParam.jpg b/docs/images/error/addTagTask_error_noParam.jpg
new file mode 100644
index 00000000000..a054d0fecd4
Binary files /dev/null and b/docs/images/error/addTagTask_error_noParam.jpg differ
diff --git a/docs/images/error/addTagTask_error_noParameters.png b/docs/images/error/addTagTask_error_noParameters.png
new file mode 100644
index 00000000000..2b7fb7ebc61
Binary files /dev/null and b/docs/images/error/addTagTask_error_noParameters.png differ
diff --git a/docs/images/error/addTagTask_error_prefix.jpg b/docs/images/error/addTagTask_error_prefix.jpg
new file mode 100644
index 00000000000..4885c1ed956
Binary files /dev/null and b/docs/images/error/addTagTask_error_prefix.jpg differ
diff --git a/docs/images/error/addTagTask_error_validIndex.jpg b/docs/images/error/addTagTask_error_validIndex.jpg
new file mode 100644
index 00000000000..7e9c9ba7e33
Binary files /dev/null and b/docs/images/error/addTagTask_error_validIndex.jpg differ
diff --git a/docs/images/error/addTagTask_error_validIndex.png b/docs/images/error/addTagTask_error_validIndex.png
new file mode 100644
index 00000000000..5851ef088d2
Binary files /dev/null and b/docs/images/error/addTagTask_error_validIndex.png differ
diff --git a/docs/images/error/addTask_error.png b/docs/images/error/addTask_error.png
index 9532cbea33b..b1738255581 100644
Binary files a/docs/images/error/addTask_error.png and b/docs/images/error/addTask_error.png differ
diff --git a/docs/images/error/deleteAllDone_error.png b/docs/images/error/deleteAllDone_error.png
new file mode 100644
index 00000000000..8f709b4c726
Binary files /dev/null and b/docs/images/error/deleteAllDone_error.png differ
diff --git a/docs/images/error/deletePerson_error.png b/docs/images/error/deletePerson_error.png
index 2442e0f1695..1e675359688 100644
Binary files a/docs/images/error/deletePerson_error.png and b/docs/images/error/deletePerson_error.png differ
diff --git a/docs/images/error/deletePerson_wrongIndex.png b/docs/images/error/deletePerson_wrongIndex.png
new file mode 100644
index 00000000000..a9434a55fdb
Binary files /dev/null and b/docs/images/error/deletePerson_wrongIndex.png differ
diff --git a/docs/images/error/deleteTask_error.png b/docs/images/error/deleteTask_error.png
new file mode 100644
index 00000000000..799f3121a8d
Binary files /dev/null and b/docs/images/error/deleteTask_error.png differ
diff --git a/docs/images/error/deleteTask_error1.png b/docs/images/error/deleteTask_error1.png
deleted file mode 100644
index b5aa682c5ee..00000000000
Binary files a/docs/images/error/deleteTask_error1.png and /dev/null differ
diff --git a/docs/images/error/deleteTask_wrongIndex.png b/docs/images/error/deleteTask_wrongIndex.png
new file mode 100644
index 00000000000..bf42e18dbb2
Binary files /dev/null and b/docs/images/error/deleteTask_wrongIndex.png differ
diff --git a/docs/images/error/editPerson_error.png b/docs/images/error/editPerson_error.png
index e61398dc723..daf7fd155a7 100644
Binary files a/docs/images/error/editPerson_error.png and b/docs/images/error/editPerson_error.png differ
diff --git a/docs/images/error/editPerson_missingFields.png b/docs/images/error/editPerson_missingFields.png
new file mode 100644
index 00000000000..656aabc4158
Binary files /dev/null and b/docs/images/error/editPerson_missingFields.png differ
diff --git a/docs/images/error/editPerson_wrongIndex.png b/docs/images/error/editPerson_wrongIndex.png
index b14016905d7..1e2821902c0 100644
Binary files a/docs/images/error/editPerson_wrongIndex.png and b/docs/images/error/editPerson_wrongIndex.png differ
diff --git a/docs/images/error/editTask_error.png b/docs/images/error/editTask_error.png
index 8c0371c260e..d166c275694 100644
Binary files a/docs/images/error/editTask_error.png and b/docs/images/error/editTask_error.png differ
diff --git a/docs/images/error/findAllTag_error.png b/docs/images/error/findAllTag_error.png
new file mode 100644
index 00000000000..aac66d0c25c
Binary files /dev/null and b/docs/images/error/findAllTag_error.png differ
diff --git a/docs/images/error/findPerson_error.png b/docs/images/error/findPerson_error.png
index e3f8e8dae58..fc1547be4ca 100644
Binary files a/docs/images/error/findPerson_error.png and b/docs/images/error/findPerson_error.png differ
diff --git a/docs/images/error/findTag_error.png b/docs/images/error/findTag_error.png
new file mode 100644
index 00000000000..0f9d4a580b5
Binary files /dev/null and b/docs/images/error/findTag_error.png differ
diff --git a/docs/images/error/findTask_error.png b/docs/images/error/findTask_error.png
index e33452a48eb..8bc9c9f5380 100644
Binary files a/docs/images/error/findTask_error.png and b/docs/images/error/findTask_error.png differ
diff --git a/docs/images/error/markTask_error.png b/docs/images/error/markTask_error.png
index 591836c541b..3dd3e039bbd 100644
Binary files a/docs/images/error/markTask_error.png and b/docs/images/error/markTask_error.png differ
diff --git a/docs/images/error/markTask_wrongIndex.png b/docs/images/error/markTask_wrongIndex.png
new file mode 100644
index 00000000000..83fb238ecdf
Binary files /dev/null and b/docs/images/error/markTask_wrongIndex.png differ
diff --git a/docs/images/error/unmarkTask_error.png b/docs/images/error/unmarkTask_error.png
index 78bd16577eb..cf7d5ad3f20 100644
Binary files a/docs/images/error/unmarkTask_error.png and b/docs/images/error/unmarkTask_error.png differ
diff --git a/docs/images/error/unmarkTask_wrongIndex.png b/docs/images/error/unmarkTask_wrongIndex.png
new file mode 100644
index 00000000000..84be18858fa
Binary files /dev/null and b/docs/images/error/unmarkTask_wrongIndex.png differ
diff --git a/docs/images/findPerson_success.png b/docs/images/findPerson_success.png
deleted file mode 100644
index 9c181439098..00000000000
Binary files a/docs/images/findPerson_success.png and /dev/null differ
diff --git a/docs/images/findPerson_success_zeroResults.png b/docs/images/findPerson_success_zeroResults.png
deleted file mode 100644
index 1e800e1abce..00000000000
Binary files a/docs/images/findPerson_success_zeroResults.png and /dev/null differ
diff --git a/docs/images/listPerson_success.png b/docs/images/listPerson_success.png
deleted file mode 100644
index bde38644ddd..00000000000
Binary files a/docs/images/listPerson_success.png and /dev/null differ
diff --git a/docs/images/output/addPerson_success.png b/docs/images/output/addPerson_success.png
new file mode 100644
index 00000000000..ea6e1cbf104
Binary files /dev/null and b/docs/images/output/addPerson_success.png differ
diff --git a/docs/images/output/addTagPerson_success.png b/docs/images/output/addTagPerson_success.png
new file mode 100644
index 00000000000..498793341f4
Binary files /dev/null and b/docs/images/output/addTagPerson_success.png differ
diff --git a/docs/images/output/addTagPerson_success_oneNew.jpg b/docs/images/output/addTagPerson_success_oneNew.jpg
new file mode 100644
index 00000000000..52882a7986c
Binary files /dev/null and b/docs/images/output/addTagPerson_success_oneNew.jpg differ
diff --git a/docs/images/output/addTagPerson_success_oneNewOneOld.jpg b/docs/images/output/addTagPerson_success_oneNewOneOld.jpg
new file mode 100644
index 00000000000..55aaf212a9a
Binary files /dev/null and b/docs/images/output/addTagPerson_success_oneNewOneOld.jpg differ
diff --git a/docs/images/output/addTagPerson_success_twoNew.jpg b/docs/images/output/addTagPerson_success_twoNew.jpg
new file mode 100644
index 00000000000..83506495247
Binary files /dev/null and b/docs/images/output/addTagPerson_success_twoNew.jpg differ
diff --git a/docs/images/output/addTagTask_success.png b/docs/images/output/addTagTask_success.png
new file mode 100644
index 00000000000..78a08802254
Binary files /dev/null and b/docs/images/output/addTagTask_success.png differ
diff --git a/docs/images/output/addTagTask_success_oneNewOneOld.jpg b/docs/images/output/addTagTask_success_oneNewOneOld.jpg
new file mode 100644
index 00000000000..334d496a232
Binary files /dev/null and b/docs/images/output/addTagTask_success_oneNewOneOld.jpg differ
diff --git a/docs/images/output/addTask_success.png b/docs/images/output/addTask_success.png
deleted file mode 100644
index cb77ecaca56..00000000000
Binary files a/docs/images/output/addTask_success.png and /dev/null differ
diff --git a/docs/images/output/addTask_success1.png b/docs/images/output/addTask_success1.png
new file mode 100644
index 00000000000..d4f2d9d7330
Binary files /dev/null and b/docs/images/output/addTask_success1.png differ
diff --git a/docs/images/output/addTask_success2.png b/docs/images/output/addTask_success2.png
new file mode 100644
index 00000000000..30c7456f94e
Binary files /dev/null and b/docs/images/output/addTask_success2.png differ
diff --git a/docs/images/output/deleteAllDone_success.png b/docs/images/output/deleteAllDone_success.png
new file mode 100644
index 00000000000..b80cb169014
Binary files /dev/null and b/docs/images/output/deleteAllDone_success.png differ
diff --git a/docs/images/output/deleteAllPerson_success.png b/docs/images/output/deleteAllPerson_success.png
new file mode 100644
index 00000000000..a3911a8b515
Binary files /dev/null and b/docs/images/output/deleteAllPerson_success.png differ
diff --git a/docs/images/output/deleteAllTask_success.png b/docs/images/output/deleteAllTask_success.png
index eeece588f9b..d787e0109c2 100644
Binary files a/docs/images/output/deleteAllTask_success.png and b/docs/images/output/deleteAllTask_success.png differ
diff --git a/docs/images/output/deletePerson_success.png b/docs/images/output/deletePerson_success.png
index bf2eb38c998..bec4e6063d9 100644
Binary files a/docs/images/output/deletePerson_success.png and b/docs/images/output/deletePerson_success.png differ
diff --git a/docs/images/output/deletePerson_success_filteredList.png b/docs/images/output/deletePerson_success_filteredList.png
new file mode 100644
index 00000000000..79833d9e361
Binary files /dev/null and b/docs/images/output/deletePerson_success_filteredList.png differ
diff --git a/docs/images/output/deleteTagPerson_success.png b/docs/images/output/deleteTagPerson_success.png
new file mode 100644
index 00000000000..23641a81112
Binary files /dev/null and b/docs/images/output/deleteTagPerson_success.png differ
diff --git a/docs/images/output/deleteTagTask_success.png b/docs/images/output/deleteTagTask_success.png
new file mode 100644
index 00000000000..3f1663108f9
Binary files /dev/null and b/docs/images/output/deleteTagTask_success.png differ
diff --git a/docs/images/output/deleteTask_success.png b/docs/images/output/deleteTask_success.png
new file mode 100644
index 00000000000..2351aa40079
Binary files /dev/null and b/docs/images/output/deleteTask_success.png differ
diff --git a/docs/images/output/deleteTask_success1.png b/docs/images/output/deleteTask_success1.png
deleted file mode 100644
index 779d88028bf..00000000000
Binary files a/docs/images/output/deleteTask_success1.png and /dev/null differ
diff --git a/docs/images/output/deleteTask_success_filteredList.png b/docs/images/output/deleteTask_success_filteredList.png
new file mode 100644
index 00000000000..505dd389c49
Binary files /dev/null and b/docs/images/output/deleteTask_success_filteredList.png differ
diff --git a/docs/images/output/editPerson_success.png b/docs/images/output/editPerson_success.png
index 46b39b4ff85..524a776d673 100644
Binary files a/docs/images/output/editPerson_success.png and b/docs/images/output/editPerson_success.png differ
diff --git a/docs/images/output/editPerson_success_clearTag.png b/docs/images/output/editPerson_success_clearTag.png
new file mode 100644
index 00000000000..221c01573c1
Binary files /dev/null and b/docs/images/output/editPerson_success_clearTag.png differ
diff --git a/docs/images/output/editTask_success1.png b/docs/images/output/editTask_success1.png
index ae0ab6f0c0b..b212c3a2c90 100644
Binary files a/docs/images/output/editTask_success1.png and b/docs/images/output/editTask_success1.png differ
diff --git a/docs/images/output/editTask_success2.png b/docs/images/output/editTask_success2.png
index 6cd31f7184e..774a7894100 100644
Binary files a/docs/images/output/editTask_success2.png and b/docs/images/output/editTask_success2.png differ
diff --git a/docs/images/output/findAllTag_success1.png b/docs/images/output/findAllTag_success1.png
new file mode 100644
index 00000000000..d322c2454ab
Binary files /dev/null and b/docs/images/output/findAllTag_success1.png differ
diff --git a/docs/images/output/findAllTag_success2.png b/docs/images/output/findAllTag_success2.png
new file mode 100644
index 00000000000..487d33acb40
Binary files /dev/null and b/docs/images/output/findAllTag_success2.png differ
diff --git a/docs/images/output/findDone_noResults.png b/docs/images/output/findDone_noResults.png
new file mode 100644
index 00000000000..80ca69fb5df
Binary files /dev/null and b/docs/images/output/findDone_noResults.png differ
diff --git a/docs/images/output/findDone_success.png b/docs/images/output/findDone_success.png
new file mode 100644
index 00000000000..5d9820c8945
Binary files /dev/null and b/docs/images/output/findDone_success.png differ
diff --git a/docs/images/output/findNotDone_noResults.png b/docs/images/output/findNotDone_noResults.png
new file mode 100644
index 00000000000..006e3b0ade6
Binary files /dev/null and b/docs/images/output/findNotDone_noResults.png differ
diff --git a/docs/images/output/findNotDone_success.png b/docs/images/output/findNotDone_success.png
new file mode 100644
index 00000000000..a0edd01c372
Binary files /dev/null and b/docs/images/output/findNotDone_success.png differ
diff --git a/docs/images/output/findPerson_noResults.png b/docs/images/output/findPerson_noResults.png
index ddee113c1eb..4e302acf88e 100644
Binary files a/docs/images/output/findPerson_noResults.png and b/docs/images/output/findPerson_noResults.png differ
diff --git a/docs/images/output/findPerson_success.png b/docs/images/output/findPerson_success.png
index cea8323d7bd..0f91d9ef7db 100644
Binary files a/docs/images/output/findPerson_success.png and b/docs/images/output/findPerson_success.png differ
diff --git a/docs/images/output/findTag_success1.png b/docs/images/output/findTag_success1.png
new file mode 100644
index 00000000000..a5f993da985
Binary files /dev/null and b/docs/images/output/findTag_success1.png differ
diff --git a/docs/images/output/findTag_success2.png b/docs/images/output/findTag_success2.png
new file mode 100644
index 00000000000..4c146ecb65f
Binary files /dev/null and b/docs/images/output/findTag_success2.png differ
diff --git a/docs/images/output/findTask_noResults.png b/docs/images/output/findTask_noResults.png
index 47c412010dd..b6d7c1bc0cc 100644
Binary files a/docs/images/output/findTask_noResults.png and b/docs/images/output/findTask_noResults.png differ
diff --git a/docs/images/output/findTask_success.png b/docs/images/output/findTask_success.png
index 6d3c968cab5..a0c76069e67 100644
Binary files a/docs/images/output/findTask_success.png and b/docs/images/output/findTask_success.png differ
diff --git a/docs/images/output/help_success.png b/docs/images/output/help_success.png
index 9843d3f46cb..d23691ffd06 100644
Binary files a/docs/images/output/help_success.png and b/docs/images/output/help_success.png differ
diff --git a/docs/images/output/listAll_success.png b/docs/images/output/listAll_success.png
new file mode 100644
index 00000000000..4d37389bf4d
Binary files /dev/null and b/docs/images/output/listAll_success.png differ
diff --git a/docs/images/output/listPerson_success.png b/docs/images/output/listPerson_success.png
new file mode 100644
index 00000000000..07ba3edbf39
Binary files /dev/null and b/docs/images/output/listPerson_success.png differ
diff --git a/docs/images/output/listTag_success.png b/docs/images/output/listTag_success.png
new file mode 100644
index 00000000000..615cf06baad
Binary files /dev/null and b/docs/images/output/listTag_success.png differ
diff --git a/docs/images/output/listTask_success.png b/docs/images/output/listTask_success.png
index 456bc6c84c6..8285b0e4689 100644
Binary files a/docs/images/output/listTask_success.png and b/docs/images/output/listTask_success.png differ
diff --git a/docs/images/output/markTask_success.png b/docs/images/output/markTask_success.png
index 8d84852a41e..f521c9b6510 100644
Binary files a/docs/images/output/markTask_success.png and b/docs/images/output/markTask_success.png differ
diff --git a/docs/images/output/markTask_success_filteredList.png b/docs/images/output/markTask_success_filteredList.png
new file mode 100644
index 00000000000..6859ae208f6
Binary files /dev/null and b/docs/images/output/markTask_success_filteredList.png differ
diff --git a/docs/images/output/unmarkTask_success.png b/docs/images/output/unmarkTask_success.png
index 4cbf4ec060d..6e0bc38e925 100644
Binary files a/docs/images/output/unmarkTask_success.png and b/docs/images/output/unmarkTask_success.png differ
diff --git a/docs/images/output/unmarkTask_success_filteredList.png b/docs/images/output/unmarkTask_success_filteredList.png
new file mode 100644
index 00000000000..4af036e4d62
Binary files /dev/null and b/docs/images/output/unmarkTask_success_filteredList.png differ
diff --git a/src/main/java/seedu/address/logic/commands/AddPersonCommand.java b/src/main/java/seedu/address/logic/commands/AddPersonCommand.java
index f77ee0cbcee..8b4943e686e 100644
--- a/src/main/java/seedu/address/logic/commands/AddPersonCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddPersonCommand.java
@@ -34,8 +34,8 @@ public class AddPersonCommand extends Command {
+ PREFIX_PHONE + "98765432 "
+ PREFIX_EMAIL + "johnd@example.com "
+ PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
- + PREFIX_TAG + "friends "
- + PREFIX_TAG + "owesMoney";
+ + PREFIX_TAG + "Microsoft "
+ + PREFIX_TAG + "guestSpeaker";
public static final String MESSAGE_SUCCESS = "New person added: %1$s";
public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
diff --git a/src/main/java/seedu/address/logic/commands/AddTaskCommand.java b/src/main/java/seedu/address/logic/commands/AddTaskCommand.java
index 7c7fa15e7bb..20a86c00729 100644
--- a/src/main/java/seedu/address/logic/commands/AddTaskCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddTaskCommand.java
@@ -26,10 +26,10 @@ public class AddTaskCommand extends Command {
+ PREFIX_TASK_NOTE + "NOTE "
+ "[" + PREFIX_TAG + "TAG]...\n"
+ "Example: " + COMMAND_WORD + " "
- + PREFIX_TASK_TITLE + "Get flowers "
- + PREFIX_TASK_NOTE + "Wedding Anniversary "
- + PREFIX_TAG + "finance "
- + PREFIX_TAG + "class ";
+ + PREFIX_TASK_TITLE + "Meeting with team "
+ + PREFIX_TASK_NOTE + "Need to finalize event schedule "
+ + PREFIX_TAG + "orientation "
+ + PREFIX_TAG + "activities ";
public static final String MESSAGE_SUCCESS = "New task added: %1$s";
public static final String MESSAGE_DUPLICATE_TASK = "This task already exists in the address book";
diff --git a/src/main/java/seedu/address/logic/commands/EditTaskCommand.java b/src/main/java/seedu/address/logic/commands/EditTaskCommand.java
index a0d1cfc5271..3a8c4741d34 100644
--- a/src/main/java/seedu/address/logic/commands/EditTaskCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditTaskCommand.java
@@ -41,8 +41,8 @@ public class EditTaskCommand extends Command {
+ "[" + PREFIX_TASK_TITLE + "TITLE] "
+ "[" + PREFIX_TASK_NOTE + "NOTE] "
+ "[" + PREFIX_TAG + "TAG]...\n"
- + "Example: " + COMMAND_WORD + " 1 "
- + PREFIX_TASK_TITLE + "Prepare Agenda "
+ + "Example: " + COMMAND_WORD + " 2 "
+ + PREFIX_TASK_TITLE + "Discuss Agenda and Budget "
+ PREFIX_TASK_NOTE + "To book venue";
public static final String MESSAGE_EDIT_TASK_SUCCESS = "Edited Task: %1$s";
diff --git a/src/main/java/seedu/address/logic/commands/FindPersonCommand.java b/src/main/java/seedu/address/logic/commands/FindPersonCommand.java
index 4e840a37fdf..438cc3ea636 100644
--- a/src/main/java/seedu/address/logic/commands/FindPersonCommand.java
+++ b/src/main/java/seedu/address/logic/commands/FindPersonCommand.java
@@ -20,7 +20,7 @@ public class FindPersonCommand extends Command {
+ ": Finds all persons whose names contain any of "
+ "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+ "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
- + "Example: " + COMMAND_WORD + " alice bob charlie";
+ + "Example: " + COMMAND_WORD + " alex bernice charlotte";
private final NameContainsKeywordsPredicate predicate;
diff --git a/src/main/java/seedu/address/logic/commands/FindTaskCommand.java b/src/main/java/seedu/address/logic/commands/FindTaskCommand.java
index 98d5d409bb4..7fc242577e4 100644
--- a/src/main/java/seedu/address/logic/commands/FindTaskCommand.java
+++ b/src/main/java/seedu/address/logic/commands/FindTaskCommand.java
@@ -20,7 +20,7 @@ public class FindTaskCommand extends Command {
+ ": Finds all tasks whose title or note contain any of "
+ "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+ "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
- + "Example: " + COMMAND_WORD + " agenda budget";
+ + "Example: " + COMMAND_WORD + " budget";
private final TaskContainsKeywordsPredicate predicate;
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 6e25361e085..594ce58eb87 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -24,29 +24,30 @@ public static Person[] getSamplePersons() {
return new Person[] {
new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
new Address("Blk 30 Geylang Street 29, #06-40"),
- getTagSet("friends")),
+ getTagSet("catering", "RilassisCatering")),
new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
- getTagSet("colleagues", "friends")),
+ getTagSet("soundSystems", "EragonSounds")),
new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
- getTagSet("neighbours")),
- new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
- new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
- getTagSet("family")),
- new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
- new Address("Blk 47 Tampines Street 20, #17-35"),
- getTagSet("classmates")),
- new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
- new Address("Blk 45 Aljunied Street 85, #11-31"),
- getTagSet("colleagues"))
+ getTagSet("flowers", "CharlottesBoutique")),
+ new Person(new Name("Xiangs Catering"), new Phone("62840300"), new Email("sales@xiangscatering.com.sg"),
+ new Address("171 Kampong Ampat 02-02 KA Foodlink, 368330"),
+ getTagSet("378perMeal", "catering")),
+ new Person(new Name("EATZ"), new Phone("67890328"), new Email("sales@eatzcatering.com"),
+ new Address("1550 Bedok North Ave 4, #04-17, 489950"),
+ getTagSet("1000perMeal", "catering")),
+ new Person(new Name("Angels Restaurant"), new Phone("62431802"), new Email("orders@rasa2.sg"),
+ new Address("3017 Bedok North Street 5, Singapore 486121"),
+ getTagSet("540perMeal", "catering"))
};
}
public static Task[] getSampleTasks() {
return new Task[] {
- new Task(new Title("Find caterer"), new Note("for 221 students"), getTagSet("caterer")),
- new Task(new Title("Create budget"), new Note("for CS2102"), getTagSet("finance", "class"))
+ new Task(new Title("Find caterer"), new Note("for 221 students in day 1 of orientation"), getTagSet(
+ "caterer", "orientation")),
+ new Task(new Title("Create budget"), new Note("for finale night"), getTagSet("finance", "orientation"))
};
}